From 211bda0966e0cd7f2292ca89a88024a9118da55e Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic@users.sourceforge.net>
Date: Fri, 19 Dec 2008 09:36:45 +0000
Subject: ext/pulse/pulsemixerctrl.c: And remove temporary comment pointing to
 the bug ticket.

Original commit message from CVS:
* ext/pulse/pulsemixerctrl.c:
And remove temporary comment pointing to the bug ticket.
* gst/avi/gstavimux.c:
Move reoccuring logging to LOG and log instance too.
---
 ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 679cf75e..b7ba8bd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-19  Stefan Kost  <ensonic@users.sf.net>
+
+	* ext/pulse/pulsemixerctrl.c:
+	  And remove temporary comment pointing to the bug ticket.
+
+	* gst/avi/gstavimux.c:
+	  Move reoccuring logging to LOG and log instance too.
+
 2008-12-17  Stefan Kost  <ensonic@users.sf.net>
 
 	* ext/pulse/pulsemixerctrl.c:
@@ -183,6 +191,7 @@
 	Make usage of libv4l optional by a configure parameter.
 	Fixes bug #563504.
 
+>>>>>>> 1.3872
 2008-12-05  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* docs/plugins/Makefile.am:
-- 
cgit v1.2.3