]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bbcbb95 992b22b)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Sat, 3 Aug 2013 12:49:26 +0000 (14:49 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 3 Aug 2013 12:49:26 +0000 (14:49 +0200)
1  2 
misc/tools/all/xonotic.subr patch | diff1 | diff2 | blob | history

diff --cc misc/tools/all/xonotic.subr
Simple merge