]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f99f17 abb34dc)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Sun, 31 Jul 2011 19:26:01 +0000 (21:26 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sun, 31 Jul 2011 19:26:01 +0000 (21:26 +0200)
1  2 
all patch | diff1 | diff2 | blob | history

diff --cc all
Simple merge