Merge branch 'master' into develope
authorAlexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Wed, 10 Aug 2011 12:21:45 +0000 (14:21 +0200)
committerAlexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Wed, 10 Aug 2011 12:21:45 +0000 (14:21 +0200)
commitf204d5669c41fa3884f6070bd89554f8c1aa3712
tree27839b31bae4ee20b82e6fb3e8cef1f29a2fab1b
parent7554585a80ca2a8ebdcd5d1f1693ffe8e39b571d
parent885a1474729164f3f049a38c27c6f8c148fee95f
Merge branch 'master' into develope
src/daemon/dlt_daemon_common.c
src/daemon/dlt_daemon_common.h