projects
/
platform
/
upstream
/
dbus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cc5404c
337d943
)
Merge branch 'dbus-1.4'
author
Simon McVittie
<simon.mcvittie@collabora.co.uk>
Wed, 21 Sep 2011 17:21:09 +0000
(18:21 +0100)
committer
Simon McVittie
<simon.mcvittie@collabora.co.uk>
Wed, 21 Sep 2011 17:21:09 +0000
(18:21 +0100)
Conflicts:
NEWS
configure.ac
Trivial merge