]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 687a87c 5a04e84)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 27 May 2011 17:39:03 +0000 (19:39 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 27 May 2011 17:39:03 +0000 (19:39 +0200)
1  2 
all patch | diff1 | diff2 | blob | history

diff --cc all
Simple merge