Merge branch 'master' into gui

Former-commit-id: b5a6eba7494e7595000e3c7e1f3c77077485519f [formerly 74e8b34c50d86cea8be86dcc5d9b82e112db9277] [formerly 07e6a0bd2e00dcb9517c6ddc1d9ca7d3326707ae [formerly 59878811e379ef9bfd66e6fd0a0f32eaa39dcc6b]] Former-commit-id: b7a83377bc61d378410ce33748ab63357ee53abb [formerly d789d8762086eb0dd43e0cef08f1edfbd8d346f2] Former-commit-id: 7aa71e252bf91965f8f488dd9396e6287607edf9
2016-10-10 22:10:36 +02:00
parent 3027a00c90 d59fd12824
commit 05dd93c549
92 changed files with 2231 additions and 344 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,27 @@
 # Nazara build
 build/config.lua
+
+# Nazara libraries
+lib/*
+
+# Nazara package
+package/*
+
+# Example files
+>>>>>>> master
 examples/bin/*.exe
 examples/bin/*.pdb
 examples/bin/*.dll
 examples/bin/*.so
+
+# Unit tests
 tests/*.exe
 tests/*.pdb
 tests/*.dll
 tests/*.so
-lib/*
+
+# Example generated files
+examples/bin/HardwareInfo.txt

 # Example generated files
 examples/bin/HardwareInfo.txt