Merge branch 'mirceakitsune/weapon_hagar_secondary_load' of git://git.xonotic.org...
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 1 May 2011 12:51:00 +0000 (15:51 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 1 May 2011 12:51:00 +0000 (15:51 +0300)
commit59c257eff12dbe51d08f3913b8c73102e3478a6e
tree8bec95b4bbaf31c3d7eeba0f369cda4dbf312f16
parent4ea08d72371a3e1b4d62c0ebdef587fc22e9a96f
parentafd46d09866bb25725ff873132683890dbbca098
Merge branch 'mirceakitsune/weapon_hagar_secondary_load' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir into mirceakitsune/weapon_hagar_secondary_load