Merge branch 'develop_performance' into develop
authorAlexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Fri, 23 Sep 2011 18:03:38 +0000 (20:03 +0200)
committerAlexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Fri, 23 Sep 2011 18:03:38 +0000 (20:03 +0200)
commit0eaf6ec6b762018db31f7626bbc6e2cdfc374c5c
treeb422bd734daedbd2e5fbd9b17f53dbc86d144c6c
parent92e89722f952c156254ff752d75edfdb26474ff6
parent7d6dab10064a6fc0c1902f8a747afb5ae0290eb6
Merge branch 'develop_performance' into develop

Conflicts:
include/dlt/dlt_version.h
src/daemon/dlt-daemon.c
src/daemon/dlt-daemon.c
src/daemon/dlt-daemon.h