]> 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: 185b8cd b37190e)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@alientrap.org>
Fri, 3 Sep 2010 15:39:36 +0000 (17:39 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Fri, 3 Sep 2010 15:39:36 +0000 (17:39 +0200)

Trivial merge