projects / profile / ivi / murphy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 959d274 3a3a572)
Merge branch 'systemd-bus+native-types'
authorKrisztian Litkey <krisztian.litkey@intel.com>
Wed, 8 Jan 2014 11:33:29 +0000 (13:33 +0200)
committerKrisztian Litkey <krisztian.litkey@intel.com>
Wed, 8 Jan 2014 11:33:29 +0000 (13:33 +0200)
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history
src/plugins/plugin-resource-dbus.c patch | diff1 | diff2 | blob | history

diff --cc src/Makefile.am
Simple merge
diff --cc src/plugins/plugin-resource-dbus.c
Simple merge
Domain: Multimedia / Uncategorized;