summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorRobert McQueen <robot101@debian.org>2005-10-29 17:02:58 +0000
committerRobert McQueen <robot101@debian.org>2005-10-29 17:02:58 +0000
commit2d74492ba2c61a41d9d22a8872806a8184acef16 (patch)
tree130906074c1b591f35fec59753a11f27416108ac /test
parent8c9701d6c53621f933d57bfcdc4a1a62217ff266 (diff)
2005-10-29 Robert McQueen <robot101@debian.org>
* glib/Makefile.am, glib/examples/Makefile.am, glib/examples/statemachine/Makefile.am: Merge patch from Ubuntu by Daniel Stone to replace explicit calls to libtool with $(LIBTOOL). * test/python/.cvsignore: Add run-with-tmp-session-bus.conf. * tools/dbus-monitor.1, tools/dbus-monitor.c: Merge dbus-monitor patch from Ubuntu by Daniel Silverstone to allow specifying match rules on the command line.
Diffstat (limited to 'test')
-rw-r--r--test/python/.cvsignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/python/.cvsignore b/test/python/.cvsignore
index 282522db..f5e130db 100644
--- a/test/python/.cvsignore
+++ b/test/python/.cvsignore
@@ -1,2 +1,3 @@
Makefile
Makefile.in
+run-with-tmp-session-bus.conf