Merge remote branch 'origin/fruitiex/menu-hud_damage'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 3 Dec 2010 07:31:23 +0000 (08:31 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 3 Dec 2010 07:31:23 +0000 (08:31 +0100)
commitee6e2d1de97777a4fdfdb750f412a12dce2178d7
tree929351c84c63bbf34a070d89f7577e6cc9ff2c7f
parent4c1cedcd6343ef7049788cb995056c1f693c53a2
parentb5eae9f5a36bb5883674361cd99f5a2d3397a3c0
Merge remote branch 'origin/fruitiex/menu-hud_damage'