summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog9
1 files changed, 9 insertions, 0 deletions
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: