diff options
| author | Suman Sunkara <sunkaras@google.com> | 2010-11-16 15:09:26 -0500 |
|---|---|---|
| committer | Suman Sunkara <sunkaras@google.com> | 2010-11-16 16:30:59 -0500 |
| commit | 4b3f72001de952aaf3874d3ce2dca3cb3fbe3928 (patch) | |
| tree | 754d87a4fa5cae908388f0a26b2affad7cd8a523 /nestegg/.gitignore | |
| parent | b9a18344cf8e5283928525c5ac0897ede79f9e57 (diff) | |
| parent | 00fe7441e9c5cbd898a8382d49cf9396d8482464 (diff) | |
| download | libvpx-4b3f72001de952aaf3874d3ce2dca3cb3fbe3928.tar libvpx-4b3f72001de952aaf3874d3ce2dca3cb3fbe3928.tar.gz libvpx-4b3f72001de952aaf3874d3ce2dca3cb3fbe3928.tar.bz2 libvpx-4b3f72001de952aaf3874d3ce2dca3cb3fbe3928.zip | |
Merge branch 'experimental' of ssh://on2-git.corp.google.com:29418/libvpx into test
Conflicts:
vp8/common/blockd.h
vp8/decoder/decodemv.c
vp8/decoder/decodframe.c
vp8/decoder/demode.c
vp8/decoder/onyxd_if.c
vp8/decoder/onyxd_int.h
vp8/encoder/encodeframe.c
Change-Id: Ic379f4dffaded9796dc19d56be304d3f8527c61f
Diffstat (limited to 'nestegg/.gitignore')
| -rw-r--r-- | nestegg/.gitignore | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/nestegg/.gitignore b/nestegg/.gitignore new file mode 100644 index 000000000..b2ba99c3f --- /dev/null +++ b/nestegg/.gitignore @@ -0,0 +1,40 @@ +*.lo +*.o +*.swp +*~ +.deps +.dirstamp +.libs +Makefile +Makefile.in +_stdint.h +aclocal.m4 +autom4te.cache +compile +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +depcomp +docs/Doxyfile +docs/doxygen-build.stamp +docs/html +install-sh +libtool +ltmain.sh +m4/libtool.m4 +m4/ltoptions.m4 +m4/ltsugar.m4 +m4/ltversion.m4 +m4/lt~obsolete.m4 +missing +nestegg-uninstalled.pc +nestegg.pc +src/.dirstamp +src/libnestegg.la +stamp-h1 +test/test +include/nestegg/nestegg-stdint.h |