]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15c235b bc3c963)
Merge remote-tracking branch 'origin/mirceakitsune/weapon_hagar_secondary_load'
authormerlijn <mhofstra@gmail.com>
Fri, 13 May 2011 20:06:33 +0000 (22:06 +0200)
committermerlijn <mhofstra@gmail.com>
Fri, 13 May 2011 20:06:33 +0000 (22:06 +0200)

Trivial merge