* merge of changes from Christian
authorFrank Herchet <frank.fh.herchet@bmw.de>
Tue, 14 Feb 2012 16:00:45 +0000 (17:00 +0100)
committerFrank Herchet <frank.fh.herchet@bmw.de>
Tue, 14 Feb 2012 16:00:45 +0000 (17:00 +0100)
commit6d59e9585db35d9a3c16f01b4180ea440e4b5a4a
treeac8931eab1c733becece1a6fa49216169fdcf90e
parent000b6cb9766473e76e3f7790c6579d44a09c81c0
* merge of changes from Christian
25 files changed:
.gitignore
AudioManagerDaemon/include/ControlReceiver.h
AudioManagerDaemon/include/DatabaseHandler.h
AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
AudioManagerDaemon/src/CommandSender.cpp
AudioManagerDaemon/src/ControlReceiver.cpp
AudioManagerDaemon/src/DatabaseHandler.cpp
AudioManagerDaemon/src/SocketHandler.cpp
AudioManagerDaemon/src/TelnetServer.cpp
AudioManagerDaemon/src/main.cpp
AudioManagerDaemon/test/CommonFunctions.cpp
AudioManagerDaemon/test/CommonFunctions.h
AudioManagerDaemon/test/database/databaseTest.cpp
CHANGELOG
CMakeLists.txt
PluginCommandInterfaceDbus/src/DBusCommandSender.cpp
PluginControlInterface/include/ControlSender.h
PluginControlInterface/src/ControlSender.cpp
includes/audiomanagertypes.h
includes/command/CommandReceiveInterface.h
includes/command/CommandSendInterface.h
includes/control/ControlReceiveInterface.h
includes/control/ControlSendInterface.h
includes/routing/RoutingReceiveInterface.h
includes/routing/RoutingSendInterface.h