Merge branch 'master' into subset

This commit is contained in:
Nigel Stewart 2015-02-06 20:31:46 +10:00
commit 9110e99e03
11 changed files with 2560 additions and 2560 deletions

4
.gitattributes vendored
View File

@ -1,3 +1,3 @@
* eol=lf
* text eol=lf
*.png binary
build/* eol=crlf
build/*/* text eol=crlf