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

Conflicts:
	C.gitignore
This commit is contained in:
Justin Spahr-Summers 2012-08-02 19:03:14 -07:00
commit fae236e74a

View File

@ -3,13 +3,15 @@
# Libraries # Libraries
*.lib *.lib
*.a
# Shared objects (inc. Windows DLLs) # Shared objects (inc. Windows DLLs)
*.dll *.dll
*.so *.so
*.so.*
*.dylib *.dylib
# Executables # Executables
*.exe *.exe
*.out *.out
*.app