]> 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: bf2c46d e0c0eed)
Merge remote branch 'origin/master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Fri, 17 Sep 2010 05:38:01 +0000 (07:38 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 17 Sep 2010 05:38:01 +0000 (07:38 +0200)

Trivial merge