]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into tzork/map-dotc_test4
authorMario <mario@smbclan.net>
Mon, 27 Feb 2017 12:21:10 +0000 (22:21 +1000)
committerMario <mario@smbclan.net>
Mon, 27 Feb 2017 12:21:10 +0000 (22:21 +1000)
commitfc7a49d13a554f84e346d14ae37c1def2976069d
tree0ff926144904a7078e88a35b05c2c81dae85b3bc
parentbc495ae485892823cd17568981ceeab82501012a
parent8a4ebcae5b7f3f0ba3520f61097a3fb5bb9a1a8f
Merge branch 'master' into tzork/map-dotc_test4
scripts/entities.ent