diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-03-14 11:53:24 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-03-14 11:54:43 +0000 |
| commit | 81f2aa238beaab80489fea8056b2dbac3acc5414 (patch) | |
| tree | 5b8d2fb8e33e302b42666f4a185df3e6e27160a2 | |
| parent | f934a967e3b628ac11839117ce0aa082c9f37803 (diff) | |
| parent | 2adf484fb39853bfc4bc9a43fb73d0fc935e92c9 (diff) | |
Merge branch 'dbus-1.4', rejecting all changes
This commit changes nothing, but means that merge tracking won't try to
apply the reversion of d1d395774435..09c9d6406b75f to master in future.
0 files changed, 0 insertions, 0 deletions