]> 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: de7c6ce ef44c5f)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Sun, 1 May 2011 19:46:25 +0000 (21:46 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 1 May 2011 19:46:25 +0000 (21:46 +0200)

Trivial merge