Merge branch 'master' of 10.250.89.137:audiomangenivi

author Simon Brandner <simon.brandner@partner.bmw.de>

Fri, 1 Jul 2011 13:06:11 +0000 (15:06 +0200)

committer Simon Brandner <simon.brandner@partner.bmw.de>

Fri, 1 Jul 2011 13:06:11 +0000 (15:06 +0200)
author Simon Brandner <simon.brandner@partner.bmw.de>
Fri, 1 Jul 2011 13:06:11 +0000 (15:06 +0200)
committer Simon Brandner <simon.brandner@partner.bmw.de>
Fri, 1 Jul 2011 13:06:11 +0000 (15:06 +0200)
diff --cc AudioManagerDaemon/DataBaseHandler.cpp
Simple merge
diff --cc AudioManagerDaemon/dataTypes.h
Simple merge
diff --cc README
Simple merge
author	Simon Brandner <simon.brandner@partner.bmw.de>
	Fri, 1 Jul 2011 13:06:11 +0000 (15:06 +0200)
committer	Simon Brandner <simon.brandner@partner.bmw.de>
	Fri, 1 Jul 2011 13:06:11 +0000 (15:06 +0200)
		1	2
AudioManagerDaemon/DataBaseHandler.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
AudioManagerDaemon/dataTypes.h	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history