1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +01:00

Resolved merge conflict

This commit is contained in:
Gymnasiast
2015-05-23 14:22:24 +02:00
14 changed files with 300 additions and 49 deletions

View File

@@ -113,8 +113,8 @@ enum {
STR_LOAD_LANDSCAPE = 884,
STR_SAVE_LANDSCAPE = 885,
STR_QUIT_GAME = 886,
STR_QUIT_TO_MENU = 5156,
STR_EXIT_OPENRCT2 = 5157,
STR_QUIT_TO_MENU = 5158,
STR_EXIT_OPENRCT2 = 5159,
STR_QUIT_SCENARIO_EDITOR = 887,
STR_QUIT_ROLLERCOASTER_DESIGNER = 888,
STR_QUIT_TRACK_DESIGNS_MANAGER = 889,