summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorFrank Herchet <frank.fh.herchet@bmw.de>2012-02-09 13:25:40 +0100
committerFrank Herchet <frank.fh.herchet@bmw.de>2012-02-09 13:25:40 +0100
commita0042153abf05408409d06c5183efe0905b18055 (patch)
treea2e02851ce5448f8358fc6041e4ef609ae591485 /CHANGELOG
parent66ce11e941986259e4c403364e3ee7c8b09864f4 (diff)
downloadaudiomanager-a0042153abf05408409d06c5183efe0905b18055.tar.gz
* merge local changes with updated master
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG6
1 files changed, 0 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a342dc1..53be9ab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -41,12 +41,6 @@ Author: christian mueller <christian.ei.mueller@bmw.de>
* renaming of databasetest - copy paste fault
-commit 3a11cd051607c19d91a0eb8118fac87e937de929
-Author: Grape R5 <demo@ubuntu.(none)>
-
- * TelnetServer Implementation.
- * TelnetServerTest Implementation
-
commit 8a2db276ede7516038eb5d2bf13b89cc3ff185a7
Author: christian mueller <christian.ei.mueller@bmw.de>