]> 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: 28bfa18 06fd210)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Thu, 5 Aug 2010 17:43:54 +0000 (19:43 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 5 Aug 2010 17:43:54 +0000 (19:43 +0200)

Trivial merge