diff options
| author | Joe Ludwig <[email protected]> | 2013-07-04 11:33:04 -0700 |
|---|---|---|
| committer | Joe Ludwig <[email protected]> | 2013-07-04 11:33:04 -0700 |
| commit | 3aacf913d55f97e295cd1c2d641a6fcac31e7ac3 (patch) | |
| tree | d73ca6b7b4aa5240530008a1e4e437a1f1017960 | |
| parent | Fixed execute permissions on OSX/Linux scripts and binaries. (diff) | |
| parent | Check in gitattributes for binaries. (diff) | |
| download | source-sdk-2013-3aacf913d55f97e295cd1c2d641a6fcac31e7ac3.tar.xz source-sdk-2013-3aacf913d55f97e295cd1c2d641a6fcac31e7ac3.zip | |
Merge https://github.com/ValveSoftware/source-sdk-2013
| -rw-r--r-- | .gitattributes | 3 | ||||
| -rw-r--r-- | mp/game/mod_hl2mp/gameinfo.txt (renamed from mp/game/mod_hl2mp/GameInfo.txt) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | mp/src/devtools/bin/linux/ccache | bin | 308586 -> 308586 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | mp/src/devtools/bin/osx32/ccache | bin | 89116 -> 89116 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | mp/src/devtools/bin/osx32/protoc | bin | 1387919 -> 1382408 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | mp/src/devtools/gendbg.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | mp/src/gcsdk/bin/linux/protoc | bin | 14177233 -> 14177233 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | sp/src/devtools/bin/linux/ccache | bin | 308586 -> 308586 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | sp/src/devtools/bin/osx32/ccache | bin | 89116 -> 89116 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | sp/src/devtools/bin/osx32/protoc | bin | 1387919 -> 1382408 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | sp/src/devtools/gendbg.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | sp/src/gcsdk/bin/linux/protoc | bin | 14177233 -> 14177233 bytes |
12 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..ed043c0c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +*.exe binary +protoc binary +ccache binary diff --git a/mp/game/mod_hl2mp/GameInfo.txt b/mp/game/mod_hl2mp/gameinfo.txt index 95bf2d6d..95bf2d6d 100644 --- a/mp/game/mod_hl2mp/GameInfo.txt +++ b/mp/game/mod_hl2mp/gameinfo.txt diff --git a/mp/src/devtools/bin/linux/ccache b/mp/src/devtools/bin/linux/ccache Binary files differindex 9846e22d..9846e22d 100644..100755 --- a/mp/src/devtools/bin/linux/ccache +++ b/mp/src/devtools/bin/linux/ccache diff --git a/mp/src/devtools/bin/osx32/ccache b/mp/src/devtools/bin/osx32/ccache Binary files differindex 36a7081d..36a7081d 100644..100755 --- a/mp/src/devtools/bin/osx32/ccache +++ b/mp/src/devtools/bin/osx32/ccache diff --git a/mp/src/devtools/bin/osx32/protoc b/mp/src/devtools/bin/osx32/protoc Binary files differindex 9f535f44..f111cb24 100644..100755 --- a/mp/src/devtools/bin/osx32/protoc +++ b/mp/src/devtools/bin/osx32/protoc diff --git a/mp/src/devtools/gendbg.sh b/mp/src/devtools/gendbg.sh index 3bf30781..3bf30781 100644..100755 --- a/mp/src/devtools/gendbg.sh +++ b/mp/src/devtools/gendbg.sh diff --git a/mp/src/gcsdk/bin/linux/protoc b/mp/src/gcsdk/bin/linux/protoc Binary files differindex e33c5eef..e33c5eef 100644..100755 --- a/mp/src/gcsdk/bin/linux/protoc +++ b/mp/src/gcsdk/bin/linux/protoc diff --git a/sp/src/devtools/bin/linux/ccache b/sp/src/devtools/bin/linux/ccache Binary files differindex 9846e22d..9846e22d 100644..100755 --- a/sp/src/devtools/bin/linux/ccache +++ b/sp/src/devtools/bin/linux/ccache diff --git a/sp/src/devtools/bin/osx32/ccache b/sp/src/devtools/bin/osx32/ccache Binary files differindex 36a7081d..36a7081d 100644..100755 --- a/sp/src/devtools/bin/osx32/ccache +++ b/sp/src/devtools/bin/osx32/ccache diff --git a/sp/src/devtools/bin/osx32/protoc b/sp/src/devtools/bin/osx32/protoc Binary files differindex 9f535f44..f111cb24 100644..100755 --- a/sp/src/devtools/bin/osx32/protoc +++ b/sp/src/devtools/bin/osx32/protoc diff --git a/sp/src/devtools/gendbg.sh b/sp/src/devtools/gendbg.sh index 3bf30781..3bf30781 100644..100755 --- a/sp/src/devtools/gendbg.sh +++ b/sp/src/devtools/gendbg.sh diff --git a/sp/src/gcsdk/bin/linux/protoc b/sp/src/gcsdk/bin/linux/protoc Binary files differindex e33c5eef..e33c5eef 100644..100755 --- a/sp/src/gcsdk/bin/linux/protoc +++ b/sp/src/gcsdk/bin/linux/protoc |