]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 843874d 139b922)
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)
1  2 
maps/drain.map patch | diff1 | diff2 | blob | history
maps/techassault.map patch | diff1 | diff2 | blob | history

diff --cc maps/drain.map
Simple merge
diff --cc maps/techassault.map
Simple merge