]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into Mirio/rush, fix merge conflicts
authorSpike29 <leguen.yannick@gmail.com>
Wed, 16 Mar 2022 21:54:17 +0000 (22:54 +0100)
committerSpike29 <leguen.yannick@gmail.com>
Wed, 16 Mar 2022 21:54:17 +0000 (22:54 +0100)
commit7733a3481247f7c95a859c7526c04ecaa78d7a20
treee98d6887ee3b803037dd2915939a00545c553eff
parent843874dee9cc109aaabcb130309d36266c877a48
parent139b9223fee223e98a018a6396b5b65892fc624e
Merge branch 'master' into Mirio/rush, fix merge conflicts
maps/drain.map
maps/techassault.map