]> git.ipfire.org Git - thirdparty/dbus.git/commit
projects / thirdparty / dbus.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8acd2e2 1767840)
Merge branch 'dbus-1.4'
authorRalf Habacker <ralf.habacker@freenet.de>
Thu, 22 Sep 2011 19:26:43 +0000 (21:26 +0200)
committerRalf Habacker <ralf.habacker@freenet.de>
Thu, 22 Sep 2011 19:26:43 +0000 (21:26 +0200)
commit443b8ec3da541018f2979e3700bc8d4ee7095136
treebe3ff5bbf1771a4bf3be20c9d68a4972698b8e20tree | snapshot
parent8acd2e2148f64d0bda3353a136ae9178bce89963commit | diff
parent1767840160736c7a31bf432e6a850154d028f8accommit | diff
Merge branch 'dbus-1.4'

Conflicts:
cmake/CMakeLists.txt
cmake/CMakeLists.txt diff1 | diff2 | blob | history
Mirror of https://gitlab.freedesktop.org/dbus/dbus.git