From 2d74492ba2c61a41d9d22a8872806a8184acef16 Mon Sep 17 00:00:00 2001 From: Robert McQueen Date: Sat, 29 Oct 2005 17:02:58 +0000 Subject: 2005-10-29 Robert McQueen * 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. --- test/python/.cvsignore | 1 + 1 file changed, 1 insertion(+) (limited to 'test') 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 -- cgit