diff options
| author | Justin Spahr-Summers <Justin.SpahrSummers@gmail.com> | 2012-08-02 19:03:14 -0700 |
|---|---|---|
| committer | Justin Spahr-Summers <Justin.SpahrSummers@gmail.com> | 2012-08-02 19:03:14 -0700 |
| commit | fae236e74a38728b00d2df54d99b706316811e83 (patch) | |
| tree | 4dbcdf700bbd2eda55d0ee6293ee6946c5c9b5da | |
| parent | 8486f2204990f48c156408b0965142813b885043 (diff) | |
| parent | 1bd40f51eee156e0883358ad5bfde4900b095e74 (diff) | |
| download | gitignore-fae236e74a38728b00d2df54d99b706316811e83.tar.gz gitignore-fae236e74a38728b00d2df54d99b706316811e83.zip | |
Merge remote-tracking branch 'arsenm/patch-1'
Conflicts:
C.gitignore
| -rw-r--r-- | C.gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/C.gitignore b/C.gitignore index 4d113a7a..0331bbbd 100644 --- a/C.gitignore +++ b/C.gitignore @@ -3,13 +3,15 @@ # Libraries *.lib +*.a # Shared objects (inc. Windows DLLs) *.dll *.so +*.so.* *.dylib # Executables *.exe *.out - +*.app |