]> 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: 5774fad 78a6ac7)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Sat, 27 Aug 2011 09:40:58 +0000 (11:40 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sat, 27 Aug 2011 09:40:58 +0000 (11:40 +0200)

Trivial merge