merge from HEAD

Original commit message from CVS:
merge from HEAD
This commit is contained in:
David Schleef 2003-11-29 05:49:19 +00:00
parent 094bcaae89
commit 0766774fd7
3 changed files with 6 additions and 6 deletions

View file

@ -10,7 +10,6 @@
#define GST_DISABLE_LOADSAVE_REGISTRY 1
#define GST_DISABLE_GST_DEBUG 1
#define GST_DISABLE_LOADSAVE 1
#define GST_DISABLE_AUTOPLUG 1
#define GST_DISABLE_PARSE 1
#define GST_DISABLE_TRACE 1
#define GST_DISABLE_ALLOC_TRACE 1
@ -30,9 +29,6 @@
/* DOES NOT WORK */
@GST_DISABLE_LOADSAVE_DEFINE@
/* DOES NOT WORK */
@GST_DISABLE_AUTOPLUG_DEFINE@
/* DOES NOT WORK */
@GST_DISABLE_PARSE_DEFINE@

View file

@ -1,5 +1,7 @@
include ../Rules
tests_pass = commandline category global output
tests_pass = commandline category global
tests_fail =
tests_inconsistent = global

View file

@ -1,5 +1,7 @@
include ../Rules
tests_pass = commandline category global output
tests_pass = commandline category global
tests_fail =
tests_inconsistent = global