]> de.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: 3b354d3 5af992c)
Merge remote-tracking branch 'origin/ablu/invicible_fix'
authormerlijn <mhofstra@gmail.com>
Sat, 1 Sep 2012 18:35:53 +0000 (20:35 +0200)
committermerlijn <mhofstra@gmail.com>
Sat, 1 Sep 2012 18:35:53 +0000 (20:35 +0200)

Trivial merge