]> 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: 45054c8 438c326)
Merge remote branch 'origin/fruitiex/dance'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 20:49:41 +0000 (21:49 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 20:49:41 +0000 (21:49 +0100)
1  2 
maps/dance.map patch | diff1 | diff2 | blob | history

diff --cc maps/dance.map
Simple merge