]> 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: b21e756 1e64c1d)
Merge remote branch 'origin/mand1nga/i18n-ES'
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 31 Mar 2011 07:26:06 +0000 (09:26 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 31 Mar 2011 07:26:06 +0000 (09:26 +0200)

Trivial merge