]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 8640529 74ee735)
Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Mon, 26 Jul 2010 12:36:38 +0000 (14:36 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 26 Jul 2010 12:36:38 +0000 (14:36 +0200)

Trivial merge