]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02ec138 09b4845)
Merge remote branch 'origin/master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Sun, 5 Sep 2010 16:08:46 +0000 (18:08 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 5 Sep 2010 16:08:46 +0000 (18:08 +0200)

Trivial merge