Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

resolve merge conflicts

Browse source
This commit is contained in:
szdarkhack 2013-10-11 17:49:18 +03:00
parent b98a073b26
commit 57923070a7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Windows/resource.h
View file

@ -293,7 +293,7 @@
#define IDC_GEDBG_STEPTEX 40133 #define IDC_GEDBG_STEPTEX 40133
#define IDC_GEDBG_STEPFRAME 40134 #define IDC_GEDBG_STEPFRAME 40134
#define IDC_GEDBG_BREAKTEX 40135 #define IDC_GEDBG_BREAKTEX 40135
#define ID_OPTIONS_PAUSE_FOCUS 40133 #define ID_OPTIONS_PAUSE_FOCUS 40136
// Dummy option to let the buffered rendering hotkey cycle through all the options. // Dummy option to let the buffered rendering hotkey cycle through all the options.
#define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500 #define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500
@ -306,7 +306,7 @@
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 254 #define _APS_NEXT_RESOURCE_VALUE 254
#define _APS_NEXT_COMMAND_VALUE 40136 #define _APS_NEXT_COMMAND_VALUE 40137
#define _APS_NEXT_CONTROL_VALUE 1193 #define _APS_NEXT_CONTROL_VALUE 1193
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif