diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2008-04-03 11:11:19 -0400 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2008-04-03 11:11:19 -0400 |
| commit | 960fef844bdb0054c082a31e43f9631b1d5eb69b (patch) | |
| tree | e39cc0f5db0dce6149711c9088d2965130ade8e0 /Makefile.cvs | |
| parent | a37404111be4912cd8b51080bcbe219edded35f5 (diff) | |
| parent | 68f69d38182ed5974984b0434086e6a288b477cb (diff) | |
Merge branch 'master' of git+ssh://johnp@git.freedesktop.org/git/dbus/dbus
Conflicts:
ChangeLog
Diffstat (limited to 'Makefile.cvs')
0 files changed, 0 insertions, 0 deletions