]> 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: 52a9f8b e55b0af)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Sun, 27 May 2012 17:08:34 +0000 (19:08 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 27 May 2012 17:08:34 +0000 (19:08 +0200)

Trivial merge