conflict resolution1535/head
tree53f5c21866fb7fd91bf5f40e08648f33b1735205
-rw-r--r-- 355 .gitattributes
-rw-r--r-- 2171 .gitignore
-rw-r--r-- 351 CMakeLists.txt
-rw-r--r-- 3270 CONTRIBUTING.md
drwxr-xr-x - Engine
drwxr-xr-x - My Projects
-rw-r--r-- 2118 README.md
drwxr-xr-x - Templates
drwxr-xr-x - Tools
-rw-r--r-- 33 allProjects.txt
-rw-r--r-- 256 generateAllProjects.bat
-rw-r--r-- 2439 projects.xml