projects / profile / ivi / dlt-daemon.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92e8972 7d6dab1)
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)
Conflicts:
include/dlt/dlt_version.h
src/daemon/dlt-daemon.c

1  2 
src/daemon/dlt-daemon.c patch | diff1 | diff2 | blob | history
src/daemon/dlt-daemon.h patch | diff1 | diff2 | blob | history

diff --cc src/daemon/dlt-daemon.c
Simple merge
diff --cc src/daemon/dlt-daemon.h
Simple merge
Domain: System / Uncategorized;