dbus ChangeLog,1.913,1.914

[Robert McQueen]

Update of /cvs/dbus/dbus
In directory gabe:/tmp/cvs-serv19982

Modified Files:
	ChangeLog 
Log Message:
2005-10-29  Robert McQueen  <robot101 at 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.


Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.913
retrieving revision 1.914
diff -u -d -r1.913 -r1.914
--- ChangeLog	27 Oct 2005 16:35:43 -0000	1.913
+++ ChangeLog	29 Oct 2005 17:02:58 -0000	1.914
@@ -1,3 +1,15 @@
+2005-10-29  Robert McQueen  <robot101 at 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.
+
 2005-10-27  Ross Burton  <ross at openedhand.com>
 
 	* dbus/dbus-marshal-header.c: