]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0df96e4 5960846)
Merge remote branch 'origin/samual/defaults/swap_minelayer_mortar_priority'
authormand1nga <mand1nga@xonotic.org>
Fri, 8 Apr 2011 17:05:15 +0000 (14:05 -0300)
committermand1nga <mand1nga@xonotic.org>
Fri, 8 Apr 2011 17:05:15 +0000 (14:05 -0300)

Trivial merge