Merge remote-tracking branch 'upstream/master'

This commit is contained in:
mackal 2013-02-16 19:53:51 -05:00
commit 234cd0c4ff
5 changed files with 6 additions and 0 deletions

6
.gitignore vendored
View File

@ -23,3 +23,9 @@ CMakeFiles
Makefile Makefile
cmake_install.cmake cmake_install.cmake
install_manifest.txt install_manifest.txt
Build/
build/
Build32/
build32/
Build64/
build64/