projects / profile / ivi / automotive-message-broker.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bdb79fe 532c87a)
fixed merge
authorKevron Rees <tripzero.kev@gmail.com>
Tue, 2 Oct 2012 02:09:20 +0000 (19:09 -0700)
committerKevron Rees <tripzero.kev@gmail.com>
Tue, 2 Oct 2012 02:09:20 +0000 (19:09 -0700)
1  2 
plugins/exampleplugin.cpp patch | diff1 | diff2 | blob | history

diff --cc plugins/exampleplugin.cpp
Simple merge
Domain: System / Uncategorized;