Merge branch 'master'

This commit is contained in:
David Capello 2015-12-11 19:44:48 -03:00
commit b0aea675cf

3
.gitignore vendored
View File

@ -10,3 +10,6 @@
*.exe.manifest
*.log
*.res
# CMake output
build