projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1398fe7 5967753)
Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Thu, 5 Aug 2010 04:57:01 +0000 (06:57 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 5 Aug 2010 04:57:01 +0000 (06:57 +0200)
1  2 
all patch | diff1 | diff2 | blob | history

diff --cc all
Simple merge