]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 323f635 d7fb582)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@alientrap.org>
Thu, 23 Sep 2010 09:22:10 +0000 (11:22 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Thu, 23 Sep 2010 09:22:10 +0000 (11:22 +0200)

Trivial merge