]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce362bf 4bfcaf1)
Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Tue, 14 Sep 2010 04:00:59 +0000 (06:00 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 14 Sep 2010 04:00:59 +0000 (06:00 +0200)
1  2 
all patch | diff1 | diff2 | blob | history

diff --cc all
Simple merge