IntelOrca c6056cbb6c Merge branch 'pre-release-0.0.3' into develop ...

Conflicts:
	src/audio/audio.c

2015-11-27 22:05:40 +00:00

..

chinese_simplified.txt

Merge Localisation/master into OpenRCT2/develop.

2015-11-27 04:00:18 +00:00

chinese_traditional.txt

Merge Localisation/master into OpenRCT2/develop.

2015-11-27 04:00:18 +00:00

czech.txt

Merge Localisation/master into OpenRCT2/develop.

2015-11-27 04:00:18 +00:00

dutch.txt

Merge Localisation/master into OpenRCT2/develop.

2015-11-27 04:00:18 +00:00

english_uk.txt

Merge branch 'pre-release-0.0.3' into develop

2015-11-27 22:05:40 +00:00

english_us.txt

Merge Localisation/master into OpenRCT2/develop.

2015-11-27 04:00:18 +00:00

finnish.txt

Merge Localisation/master into OpenRCT2/develop.

2015-11-27 04:00:18 +00:00

french.txt

Merge Localisation/master into OpenRCT2/develop.

2015-11-27 04:00:18 +00:00

german.txt

Merge Localisation/master into OpenRCT2/develop.

2015-11-27 04:00:18 +00:00

hungarian.txt

Merge Localisation/master into OpenRCT2/develop.

2015-11-27 04:00:18 +00:00

italian.txt

Merge Localisation/master into OpenRCT2/develop.

2015-11-27 04:00:18 +00:00

korean.txt

Merge Localisation/master into OpenRCT2/develop.

2015-11-27 04:00:18 +00:00

polish.txt

Merge Localisation/master into OpenRCT2/develop.

2015-11-27 04:00:18 +00:00

portuguese_br.txt

Merge Localisation/master into OpenRCT2/develop.

2015-11-27 04:00:18 +00:00

russian.txt

Merge Localisation/master into OpenRCT2/develop.

2015-11-27 04:00:18 +00:00

spanish_sp.txt

Merge Localisation/master into OpenRCT2/develop.

2015-11-27 04:00:18 +00:00

swedish.txt

Merge Localisation/master into OpenRCT2/develop.

2015-11-27 04:00:18 +00:00