ref: e4d43c21c709572349b0226ac62c6c0e4c95132b
parent: 18dc92fd664357db31d7ef43337e2dee3a0f5062
parent: 6fa5c24a99e57367efd60ed56377f68808399444
author: Johann <johannkoenig@google.com>
date: Tue Sep 28 03:10:09 EDT 2010
Merge "update gitignore"
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,16 @@
-*~
*.a
+*.asm.s
*.d
*.o
-*-old
-*-new
-*.mk
-*.asm
-TAGS
-.bins
-.libs
-.deps
-/.cflags-new
-/.cflags-old
+*~
+/*-*.mk
+/*.asm
+/*.doxy
+/.bins
+/.deps
/.docs
/.install-*
+/.libs
/Makefile
/config.err
/config.mk
@@ -23,14 +20,11 @@
/decode_with_drops
/decode_with_drops.c
/decode_with_drops.dox
-/docs-generic-gnu.mk
/docs/
/doxyfile
/error_resilient
/error_resilient.c
/error_resilient.dox
-/examples-generic-gnu.mk
-/examples.doxy
/force_keyframe
/force_keyframe.c
/force_keyframe.dox
@@ -38,8 +32,7 @@
/ivfdec.dox
/ivfenc
/ivfenc.dox
-/libs-generic-gnu.mk
-/libs.doxy
+/obj_int_extract
/postproc
/postproc.c
/postproc.dox
@@ -66,3 +59,4 @@
/vpx_config.c
/vpx_config.h
/vpx_version.h
+TAGS