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)
commit7f759b2f38d0a0d40d008859691bcfebe6f8bff1
tree8487f5428bfa1b2285f2ad3944a216f22e73f560
parent959d2744ac667aa260f65257d50a417a3644babd
parent3a3a572aa48c48fd7d1786bae0dcc144fa28017d
Merge branch 'systemd-bus+native-types'
src/Makefile.am
src/plugins/plugin-resource-dbus.c