projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93b2b35 8fa0fcb)
Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divVerent@alientrap.org>
Fri, 27 Aug 2010 08:35:06 +0000 (10:35 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Fri, 27 Aug 2010 08:35:06 +0000 (10:35 +0200)
1  2 
all patch | diff1 | diff2 | blob | history

diff --cc all
Simple merge