]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'gitlab/TimePath/unified_weapons' into TimePath/unified_...
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 28 Sep 2015 05:01:24 +0000 (15:01 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 28 Sep 2015 05:02:55 +0000 (15:02 +1000)
commite175584f9680a06bb6f22e7e3a94ad98b094d394
tree77fb532d89f472a7cf97e574b67e459ac2fd3ad5
parent16061175d27b01f53646a5f5e94117bd4e310398
parent5a21a1f68548de525684836ee759c7f281b591b9
Merge remote-tracking branch 'gitlab/TimePath/unified_weapons' into TimePath/unified_weapons