]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 790e62d 3a6c991)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Sat, 4 Jun 2011 20:31:16 +0000 (22:31 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 4 Jun 2011 20:31:16 +0000 (22:31 +0200)
1  2 
all patch | diff1 | diff2 | blob | history

diff --cc all
Simple merge