merge LevelsRework

n506 · Dec 16, 2015 · 49b12d3 · 49b12d3
2 parents 093975d + b395f19
commit 49b12d3
Show file tree

Hide file tree

Showing 5 changed files with 338 additions and 227 deletions.
diff --git a/.gitignore b/.gitignore
@@ -69,6 +69,7 @@ local.properties
 */[Dd]ebug/
 */[Rr]elease/
 lib/
+*.vspx
 
 ## TODO: If you have NuGet Package Restore enabled, uncomment this
 #packages/
@@ -169,3 +170,12 @@ pip-log.txt
 
 # Mac crap
 .DS_Store
+
+#############
+## CMake
+## Since we are using cmake to create following
+#############
+CMakeFiles/
+CMakeCache.txt
+cmake_install.cmake
+Makefile