]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit1d363de3b0b14e64a0413eab582cac6712aac80e
tree97481a524b3ecf0e44543daafced99fa9f2a8a49
parent3b354d3d971a82b2f6fbcf4dd6b18e05711d0acf
parent5af992c71d375f7b4a25b2ebfff6faf646c526dd
Merge remote-tracking branch 'origin/ablu/invicible_fix'