]> 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: 5641598 9077787)
Merge remote branch 'refs/remotes/origin/mookow/map-g-23'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 24 Aug 2010 03:53:51 +0000 (05:53 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 24 Aug 2010 03:53:51 +0000 (05:53 +0200)
1  2 
maps/g-23.map patch | diff1 | diff2 | blob | history

diff --cc maps/g-23.map
Simple merge