Nicer merging.
[xonotic/xonotic-data.pk3dir.git] / .tx / merge-base
2013-09-13 Rudolf PolzerNicer merging.
2013-09-13 Rudolf PolzerImport from transifex.
2013-09-13 Rudolf PolzerIntegrate with Transifex.