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

jspahrsummers · jspahrsummers · commit fae236e74a38 · 2012-08-02T19:03:14.000-07:00
Conflicts:
	C.gitignore
diff --git 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
