]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge remote-tracking branch 'origin/diabolik/strength' into itsme/strength
authoritsme <itsme.xonotic@ymail.com>
Thu, 5 Jan 2012 22:16:34 +0000 (23:16 +0100)
committeritsme <itsme.xonotic@ymail.com>
Thu, 5 Jan 2012 22:16:34 +0000 (23:16 +0100)
commita6ee3525453054344e1b581f4c904dba8577547b
treeed2a278bd65697b3e29fe3b439238402eb420be9
parent583298da2850fb0137afe2802ecc38c2d25accb0
parent695b5cb771b8adb9166217ec706f4d17428e7fc4
Merge remote-tracking branch 'origin/diabolik/strength' into itsme/strength