Merge remote-tracking branch 'refs/remotes/TTimo/master' into PicoModelExperiment

.gitignore

@@ -1,18 +1,30 @@
-/apple/target/*
-/build
-/install/games
-/install/installs
-/install/q3data
-/install/q3map2
-/install/q3map2_urt
-/install/radiant.bin
-/install/share
-/packs
-/site.sconf
-/.sconsign.dblite
-*.pyc
-*.so
 .settings
 .DS_Store
+
+/apple/target/*
+/build
+/install
+/packs
+/tools/urt/tools/quake3/q3map2/Debug
+/tools/urt/tools/quake3/q3map2/Release
+/.sconsign.dblite
+/.vs/radiant/v14/.suo
+/radiant.opensdf
+/radiant.sdf
+/radiant.suo
+/radiant.v11.suo
+/radiant.v12.suo
+/radiant.VC.db
+/site.sconf
+
 *.obj
+*.pyc
+*.so
 *.tlog
+*.vcxproj.user
+*.zip
+
+
+
+
+