merge

narzolliam · Feb 3, 2016 · 6f2b899 · 6f2b899
2 parents ddb163a + 6b4ec07
commit 6f2b899
Show file tree

Hide file tree

Showing 567 changed files with 7,279 additions and 50,452 deletions.
diff --git a/.gitignore b/.gitignore
@@ -61,7 +61,7 @@ out
 .ycm_extra_conf.py
 
 # XCode
-build/
+^build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3