+2002-03-01 Michael Meeks <michael@ximian.com>
+ * docs/manual/Makefile.am: use $(wildcard) instead of
+ strange shell stuff.
+
+ * tools/Makefile.am: handle conditionals in a compatible way
+
+ * docs/manuals.mak: don't do silly things with if/else
+
+2002-01-15 Bastien Nocera <hadess@hadess.net>
+
+ * tests/Makefile.am: add all the dirs to the DIST_SUBDIRS
+
+2002-01-15 Bastien Nocera <hadess@hadess.net>
+
+ * tests/Makefile.am: dodge compiling memchunk and bufspeed
+ if NASM is not present
+
2002-01-03 Rodney Dawes <dobey@free.fr>
* gstreamer.spec.in: Fixed the missing plug-ins problem
* lots of build fixes for 0.3.0 release
->>>>>>> 1.3.2.2
2001-08-15 23:43 cael
* gstplay/: ChangeLog, gstmediaplay.c, gstplay.c: Added hacky check