]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85e4c41 805f654)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Sat, 5 Mar 2011 21:32:55 +0000 (22:32 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Sat, 5 Mar 2011 21:32:55 +0000 (22:32 +0100)
1  2 
all patch | diff1 | diff2 | blob | history

diff --cc all
Simple merge