]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c53177c 2498e2b)
Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Mon, 26 Apr 2010 20:48:32 +0000 (22:48 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 26 Apr 2010 20:48:32 +0000 (22:48 +0200)
1  2 
all patch | diff1 | diff2 | blob | history

diff --cc all
Simple merge