]> 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 | compact (merge: 79ef988 4defcff)
Merge remote-tracking branch 'origin/terencehill/lang_files_update'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 6 Apr 2012 18:24:24 +0000 (20:24 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 6 Apr 2012 18:24:24 +0000 (20:24 +0200)

Trivial merge