]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8d09ae1 100c8c4)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Sun, 23 Jun 2013 16:36:04 +0000 (18:36 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 23 Jun 2013 16:36:04 +0000 (18:36 +0200)
1  2 
misc/tools/xonotic-map-compiler patch | diff1 | diff2 | blob | history

diff --cc misc/tools/xonotic-map-compiler
Simple merge