]> de.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: f55c7a1 1558886)
Merge remote-tracking branch 'origin/atheros/strict-ca'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 30 Aug 2011 14:01:58 +0000 (16:01 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 30 Aug 2011 14:01:58 +0000 (16:01 +0200)

Trivial merge