]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
Merge branch 'dbus-1.4'
authorRalf Habacker <ralf.habacker@freenet.de>
Mon, 15 Aug 2011 15:33:42 +0000 (17:33 +0200)
committerRalf Habacker <ralf.habacker@freenet.de>
Mon, 15 Aug 2011 15:33:42 +0000 (17:33 +0200)
1  2 
dbus/dbus-marshal-basic.c

Simple merge