Original commit message from CVS:
foo
This commit is contained in:
Andy Wingo 2005-11-10 19:06:21 +00:00
parent d6d7f17043
commit 32745f7737

View file

@ -4934,8 +4934,6 @@
* configure.ac: * configure.ac:
hunting season on 0.9 is now OPEN hunting season on 0.9 is now OPEN
<<<<<<< ChangeLog
=======
2005-02-22 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2005-02-22 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
@ -20525,5 +20523,3 @@
* ChangeLog: moved to gstreamer/docs/random/old/ChangeLog.gst-plugins * ChangeLog: moved to gstreamer/docs/random/old/ChangeLog.gst-plugins
* moved CVS to freedesktop.org * moved CVS to freedesktop.org
>>>>>>> 1.1891