]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/it_update
authorterencehill <piuntn@gmail.com>
Sat, 3 Sep 2011 23:35:11 +0000 (01:35 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 3 Sep 2011 23:35:11 +0000 (01:35 +0200)
commit2109528108d5bddcab956564e7da6c4f3758065b
tree2696cae72b74fc4f5edf159c4df78be1c1220e4a
parent001ca74de92ac1107afe5d160583cead0ae7bebc
parentd5aff4b3eec34b8fe0a54bd4973bdd5837f086de
Merge branch 'master' into terencehill/it_update

Conflicts:
csprogs.dat.it.po
menu.dat.it.po
csprogs.dat.it.po
menu.dat.it.po