mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-07-08 12:56:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge conflict resolution in defines.h (#72)

Browse Source 
Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
2021-11-30 01:02:55 -05:00
committed by GitHub
parent c55c360b71
commit 64d9b68933
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/defines.h
+1
View File
@@ -80,6 +80,7 @@
#define TIME_TRIAL_3LAP_RECORD_5 4
#define TIME_TRIAL_1LAP_RECORD 5
/**
* Text color options
* The 2 cycling options cycle through Blue -> Green -> Red
* Cycle 2 appears to be one step ahead of Cycle 1