projects / profile / ivi / dlt-daemon.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7554585 885a147)
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)
1  2 
src/daemon/dlt_daemon_common.c patch | diff1 | diff2 | blob | history
src/daemon/dlt_daemon_common.h patch | diff1 | diff2 | blob | history

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