]> de.git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26dd98e 10899a6)
Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Thu, 12 Aug 2010 04:33:49 +0000 (06:33 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 12 Aug 2010 04:33:49 +0000 (06:33 +0200)
1  2 
all patch | diff1 | diff2 | blob | history

diff --cc all
Simple merge