projects / platform / upstream / udisks2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0338f11 e9f628e)
Merge remote-tracking branch 'origin/gdbus-port'
authorDavid Zeuthen <davidz@redhat.com>
Fri, 26 Aug 2011 17:14:47 +0000 (13:14 -0400)
committerDavid Zeuthen <davidz@redhat.com>
Fri, 26 Aug 2011 17:14:47 +0000 (13:14 -0400)
Conflicts:
tools/udisks-bash-completion.sh
tools/udisks.c

Signed-off-by: David Zeuthen <davidz@redhat.com>

Trivial merge
Domain: System / Uncategorized;