diff options
| author | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-10-21 10:52:46 +0200 |
|---|---|---|
| committer | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-10-21 10:52:46 +0200 |
| commit | df6044f7ebdaf0c38217c95b7d9cc5340567d800 (patch) | |
| tree | 0739ec3a69b104eed7aa97baa1cbc10ff7f5c769 /Android.mk | |
| parent | 5800757369ae90b770cca3ca840c2c607b9b9f21 (diff) | |
| parent | 905d1fea180dfa8c81486712689bba54639ef472 (diff) | |
Merging origin/master
Conflicts:
gst/gstbin.c
gst/gstbus.c
gst/gstdebugutils.c
gst/gstpad.c
libs/gst/base/gstbaseparse.c
libs/gst/base/gstbasesrc.c
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index d9868cab8..10b28a865 100644 --- a/Android.mk +++ b/Android.mk @@ -13,7 +13,7 @@ GST_BUILT_SOURCES := \ gst/parse/grammar.tab.h \ gst/parse/grammar.tab.c \ gst/parse/grammar.output \ - gst/parse/lex._gst_parse_yy.c \ + gst/parse/lex.priv_gst_parse_yy.c \ pkgconfig/gstreamer-0.10.pc \ pkgconfig/gstreamer-base-0.10.pc \ pkgconfig/gstreamer-controller-0.10.pc \ |