Merge branch 'master' into 0.11

This commit is contained in:
Wim Taymans 2011-10-13 08:53:34 +02:00
commit 5560d44e7a

View file

@ -21,7 +21,7 @@ noinst_PROGRAMS = generate_sine_table
generate_sine_table_SOURCES = generate_sine_table.c generate_sine_table_SOURCES = generate_sine_table.c
generate_sine_table_CFLAGS = $(GST_CFLAGS) generate_sine_table_CFLAGS = $(GST_CFLAGS)
generate_sine_table_LDADD = $(LIBM) generate_sine_table_LDADD = $(LIBM) $(GLIB_LIBS)
Android.mk: Makefile.am $(BUILT_SOURCES) Android.mk: Makefile.am $(BUILT_SOURCES)
androgenizer \ androgenizer \