Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-05-28 17:41:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pedgarcia/AppleWin

Browse Source 
Conflicts:
	resource/resource.h
	source/Configuration/PageDisk.h
This commit is contained in:
pedgarcia 2014-10-01 19:28:32 -04:00
commit 87a7485e80
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resource/Applewin.bmp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 211 KiB

After

Width:  |  Height:  |  Size: 840 KiB

8
resource/resource.h
View File

@ -105,8 +105,8 @@
#define IDC_CURSORCONTROL 1066
#define IDC_AUTOFIRE 1067
#define IDC_CENTERINGCONTROL 1068
#define IDC_COMBO_HDD1 1078
#define IDC_COMBO_HDD2 1079
#define IDC_COMBO_HDD1 1078
#define IDC_COMBO_HDD2 1079
#define IDC_COMBO_DISK1 1080
#define IDC_COMBO_DISK2 1081
#define IDM_EXIT 40001
@ -128,7 +128,11 @@
#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 147
#define _APS_NEXT_COMMAND_VALUE 40012
<<<<<<< HEAD
#define _APS_NEXT_CONTROL_VALUE 1082
=======
#define _APS_NEXT_CONTROL_VALUE 1080
>>>>>>> d9e37e007c26236870ebc635c22e944d2d271d6e
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif