Merge remote-tracking branch 'arsenm/patch-1'

Conflicts: C.gitignore
2012-08-02 19:03:14 -07:00 · 2012-08-02 19:03:14 -07:00 · fae236e74a
parent 8486f22049 1bd40f51ee
commit fae236e74a
1 changed files with 3 additions and 1 deletions
--- 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