]> 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: fb6a98c 30c5f17)
Merge branch 'master' into t0uYK8Ne/afterslime 64/head
authort0uYK8Ne <t0uYK8Ne@protonmail.com>
Fri, 3 Mar 2017 22:08:56 +0000 (14:08 -0800)
committert0uYK8Ne <t0uYK8Ne@protonmail.com>
Fri, 3 Mar 2017 22:08:56 +0000 (14:08 -0800)
1  2 
maps/afterslime.map patch | diff1 | diff2 | blob | history

diff --cc maps/afterslime.map
Simple merge