* merge local changes with updated master
authorFrank Herchet <frank.fh.herchet@bmw.de>
Thu, 9 Feb 2012 12:25:40 +0000 (13:25 +0100)
committerFrank Herchet <frank.fh.herchet@bmw.de>
Thu, 9 Feb 2012 12:25:40 +0000 (13:25 +0100)
commita0042153abf05408409d06c5183efe0905b18055
treea2e02851ce5448f8358fc6041e4ef609ae591485
parent66ce11e941986259e4c403364e3ee7c8b09864f4
* merge local changes with updated master
AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.cpp
AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.h
CHANGELOG
CMakeLists.txt
includes/config.h