diff options
author | Frank Herchet <frank.fh.herchet@bmw.de> | 2012-02-09 13:25:40 +0100 |
---|---|---|
committer | Frank Herchet <frank.fh.herchet@bmw.de> | 2012-02-09 13:25:40 +0100 |
commit | a0042153abf05408409d06c5183efe0905b18055 (patch) | |
tree | a2e02851ce5448f8358fc6041e4ef609ae591485 /CHANGELOG | |
parent | 66ce11e941986259e4c403364e3ee7c8b09864f4 (diff) | |
download | audiomanager-a0042153abf05408409d06c5183efe0905b18055.tar.gz |
* merge local changes with updated master
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -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> |