Merge branch 'multisub'

Conflicts: .gitignore Subsurface/Source/Characters/Animation/HumanoidAnimController.cs Subsurface/Source/Items/Components/Holdable/RepairTool.cs Subsurface_Solution.v12.suo
2016-07-04 17:42:31 +03:00
parent 73ff859f33 e74d5adef4
commit cd3ecd36e8
87 changed files with 2496 additions and 750 deletions
@@ -11,6 +11,7 @@ bld/
 [Oo]bj/

 *.v12.suo
+*.suo

 #performance reports & sessions
 *.vsp