Fix merge problems in LM-GENDLT-15
authorLassi Marttala <lassi.lm.marttala@partner.bmw.com>
Fri, 9 Mar 2012 08:54:35 +0000 (09:54 +0100)
committerChristian Muck <christian.muck@bmw.de>
Wed, 4 Apr 2012 12:31:03 +0000 (14:31 +0200)
commit6aeb8815571925ee035dcd263b900348db8eac9b
treeb7f0d8d518f0a6c26b5c43589ffdcf5520fee738
parent7a05de3e3aa2906a81fa7b314bc2e01e0b62956b
Fix merge problems in LM-GENDLT-15

Signed-off-by: Christian Muck <christian.muck@bmw.de>
CMakeLists.txt
ReleaseNotes.txt