Merge branch 'master' of git://github.com/github/gitignore into add-common-linux-compile-file-extensions

Conflicts: C.gitignore Updates done.
2013-11-26 22:31:25 -05:00 · 2013-11-26 22:31:25 -05:00 · c16b3bb8cf
commit c16b3bb8cf
parent 02bbff98df ecfdeba71e
95 changed files with 726 additions and 227 deletions
--- a/C.gitignore
+++ b/C.gitignore
@ -1,6 +1,8 @@
 # Object files
 *.o
 *.ko
+*.obj
+*.elf

 # Libraries
 *.lib
@ -18,3 +20,4 @@
 *.app
 *.i*86
 *.x86_64
+*.hex