(bf212a41f) v0.9.2.0 pre-release test version

2019-07-27 21:06:07 +03:00
parent afa2137bd2
commit 0f63da27b2
154 changed files with 3959 additions and 1428 deletions
@@ -12,11 +12,11 @@ bld/
 [Dd]ebug*/
 [Rr]elease*/

-# Barotrauma content folder
-BarotraumaShared/Content/
-
+# Misc vs crap 
 *.v12.suo
 *.suo
+*.csproj.user
+*.shproj.user

 #performance reports & sessions
 *.vsp
@@ -25,3 +25,6 @@ BarotraumaShared/Content/

 # Mac
 *.DS_Store
+
+#Merge script
+temp.txt