]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7aecff 432429d)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Tue, 31 Jan 2012 20:54:43 +0000 (21:54 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 31 Jan 2012 20:54:43 +0000 (21:54 +0100)
1  2 
all patch | diff1 | diff2 | blob | history

diff --cc all
Simple merge