Merge remote-tracking branch 'upstream/master'

2013-12-02 23:36:05 -08:00
parent 4459e7bb8b 2861c3fbfc
commit 8737f191f3
6742 changed files with 2805629 additions and 2805613 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,11 +1,23 @@
 creategameprojects text
 createallprojects text
+xcode_ccache_wrapper text
 vpc text
-*.sh text
-
 vpc_linux binary
 vpc_osx binary

+*.sh text
+*.c text
+*.h text
+*.H text
+*.cpp text
+*.vpc text
+*.vgc text
+*.nut text
+*.awk text
+*.pl text
+*.py text
+*.xcconfig text
+
 *.exe binary
 protoc binary
 ccache binary