[Orxonox-commit 6877] r11498 - code/branches/HUD_HS16

[patricwi at orxonox.net]

Author: patricwi
Date: 2017-10-23 14:25:36 +0200 (Mon, 23 Oct 2017)
New Revision: 11498

Modified:
   code/branches/HUD_HS16/
Log:
merge trunk into hud

Index: code/branches/HUD_HS16
===================================================================
--- code/branches/HUD_HS16	2017-10-23 12:22:13 UTC (rev 11497)
+++ code/branches/HUD_HS16	2017-10-23 12:25:36 UTC (rev 11498)

Property changes on: code/branches/HUD_HS16
___________________________________________________________________
Modified: svn:mergeinfo
## -184,4 +184,4 ##
 /code/branches/weapons:2897-3051,8143-8591
 /code/branches/weaponsystem:2742-2890
 /code/branches/weaponupdateHS14:10084-10237
-/code/trunk:11212-11496
\ No newline at end of property
+/code/trunk:11212-11497
\ No newline at end of property