Merge remote-tracking branch 'origin/master' into Menu

This commit is contained in:
Tleety
2016-03-11 14:57:59 +01:00
13 changed files with 162 additions and 33 deletions
+3 -1
View File
@@ -29,4 +29,6 @@ K=TakeDamage,1500
F2=PerformanceTimingResetAllTimers
F3=PerformanceTimingCreateExcelData
Comma=SwapToClassPick
Period=SwapToTeamPick
Period=SwapToTeamPick
Enter=PickClass,1
F5=DisconnectFromServer