gstreamer/.gitignore
Wim Taymans 32bd12dba9 Merge branch 'master' into 0.11
Conflicts:
	.gitignore
	common
	configure.ac
	ext/vorbis/gstvorbisdeclib.h
	gst-libs/gst/audio/gstaudioencoder.c
	gst-libs/gst/riff/riff-read.c
	gst/playback/gstplaysink.c
	gst/playback/gstplaysinkconvertbin.c
	tests/check/libs/video.c
2012-03-22 11:35:13 +01:00

56 lines
763 B
Text

aclocal.m4
autom4te.cache
config.h*
config.h.in
config.log
config.status
config.guess
config.sub
config.rpath
configure
gst-plugins-base.spec
gstreamer-libs-uninstalled*.pc
gstreamer-libs*.pc
gstreamer-play-uninstalled*.pc
gstreamer-play*.pc
libtool
stamp-h
stamp-h.in
stamp-h1
gst-element-check-*.m4
ltmain.sh
missing
mkinstalldirs
compile
install-sh
depcomp
autoregen.sh
ABOUT-NLS
_stdint.h
gst-plugins-base-*.tar*
.deps
.libs
*.lo
*.la
*.o
*~
*.bak
/m4
Makefile.in
Makefile
*.gir
*.typelib
/gst-libs/gst/pbutils/gstpluginsbaseversion.h
/gst-libs/gst/tag/mklangtables
/gst-libs/gst/tag/mklicensestables
/gst-libs/gst/audio/audio-marshal.[ch]
/gst-libs/gst/video/video-marshal.[ch]
/tests/examples/playback/playback-test
tmp-orc.c
gst*orc.h
tests/check/orc