projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0631b30 70fb675)
Merge branch 'dbus-1.4', omitting the DBUS_INLINE stuff
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 11 Aug 2011 10:26:58 +0000 (11:26 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 11 Aug 2011 10:26:58 +0000 (11:26 +0100)
fd.o #40000 had effectively already been fixed (slightly differently)
on master.

Conflicts:
cmake/config.h.cmake


Trivial merge
Domain: System / IPC;