Gymnasiast 81272f5ab7 Resolved merge conflict

2015-05-23 14:22:24 +02:00

..

dutch.txt

Merge Localisation/master into OpenRCT2/develop.

2015-05-23 04:00:13 +01:00

english_uk.txt

Resolved merge conflict

2015-05-23 14:22:24 +02:00

english_us.txt

Merge Localisation/master into OpenRCT2/develop.

2015-05-23 04:00:13 +01:00

french.txt

Merge Localisation/master into OpenRCT2/develop.

2015-05-22 04:00:13 +01:00

german.txt

Merge Localisation/master into OpenRCT2/develop.

2015-05-22 04:00:13 +01:00

hungarian.txt

Merge Localisation/master into OpenRCT2/develop.

2015-05-22 04:00:13 +01:00

italian.txt

Merge Localisation/master into OpenRCT2/develop.

2015-05-22 04:00:13 +01:00

polish.txt

Merge Localisation/master into OpenRCT2/develop.

2015-05-22 04:00:13 +01:00

spanish_sp.txt

Merge Localisation/master into OpenRCT2/develop.

2015-05-22 04:00:13 +01:00

swedish.txt

Merge Localisation/master into OpenRCT2/develop.

2015-05-22 04:00:13 +01:00