diff options
| author | Kristofer Rye <kristofer.rye@gmail.com> | 2013-11-26 22:31:25 -0500 |
|---|---|---|
| committer | Kristofer Rye <kristofer.rye@gmail.com> | 2013-11-26 22:31:25 -0500 |
| commit | c16b3bb8cf33a7563c18dbacf08a5494a945951c (patch) | |
| tree | ee9576ebe5cd99425c16ccaa35b564c8aac63cbc /C.gitignore | |
| parent | 02bbff98dfeac36091de21bdfd3ea1a06c18d511 (diff) | |
| parent | ecfdeba71ed84d2e96bae17d540343f37d1f9a27 (diff) | |
| download | gitignore-c16b3bb8cf33a7563c18dbacf08a5494a945951c.tar.gz gitignore-c16b3bb8cf33a7563c18dbacf08a5494a945951c.zip | |
Merge branch 'master' of git://github.com/github/gitignore into add-common-linux-compile-file-extensions
Conflicts:
C.gitignore
Updates done.
Diffstat (limited to 'C.gitignore')
| -rw-r--r-- | C.gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/C.gitignore b/C.gitignore index 8b0e5b0b..4d40434d 100644 --- 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 |