mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Resolve merge conflict

Browse Source
This commit is contained in:
Gymnasiast
2015-05-23 02:24:07 +02:00
parent 121052b807 6f3e389c2f
commit 0a093be3b1
10 changed files with 292 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.h
View File

@@ -131,6 +131,8 @@ typedef struct {
uint8 window_snap_proximity;
uint8 autosave_frequency;
uint8 hardware_display;
uint8 test_unfinished_tracks;
uint8 no_test_crashes;
} general_configuration;
typedef struct {