]> de.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: d5aff4b d51d074)
Merge remote-tracking branch 'origin/terencehill/it_update'
authorRudolf Polzer <divverent@xonotic.org>
Sun, 4 Sep 2011 06:01:02 +0000 (08:01 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 4 Sep 2011 06:01:02 +0000 (08:01 +0200)

Trivial merge