From 3f3158c3c0f1545a3b71e02dfe5d8259eebebafa Mon Sep 17 00:00:00 2001
From: mtabachenko <mtabachenko@users.sf.net>
Date: Thu, 11 Mar 2010 21:53:23 +0000
Subject: [PATCH] win32: - sorry, I`m ignored last commit from zeromus :)

---
 desmume/src/windows/resource.h   |   5 +++++
 desmume/src/windows/resources.rc | Bin 903540 -> 908720 bytes
 2 files changed, 5 insertions(+)

diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h
index 68aa6b856..d923e7201 100644
--- a/desmume/src/windows/resource.h
+++ b/desmume/src/windows/resource.h
@@ -366,6 +366,7 @@
 #define IDC_SNDCTRL_CH3NOMIX            1030
 #define IDC_ADDONS_LIST                 1033
 #define IDC_ADDONS_INFO                 1034
+#define IDC_BORDER                      1034
 #define IDC_BBROWSE                     1035
 #define IDC_PATHIMG                     1036
 #define IDC_PATH                        1037
@@ -418,6 +419,10 @@
 #define IDC_CAP1_ACTIVE                 1083
 #define IDC_CAP1_RUNNING                1084
 #define IDC_CHECK9                      1088
+#define IDC_S2X                         1090
+#define IDC_S4X                         1091
+#define IDC_S8X                         1092
+#define IDC_S16X                        1093
 #define IDM_FIRMSETTINGS                1100
 #define IDD_FIRMSETTINGS                1101
 #define IDC_EDIT1                       1102
diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc
index d1b8b31ae3a9b78dce5259628b25ee16674699d7..9e212a64fa26fc43da933bdf6e7263f27d9cf39e 100644
GIT binary patch
delta 2144
zcmeH|PiWIn9LImJN!qO2kTJR{GFG~7!y&Ux(lokKy3Id$kd29;m+lX`gUXcR!PDri
zOp&#X@bjP&J$Q~Fdjn-o@t`}XQxGcR^x{E8EC_n^B`vjGx4O$t?vjufKIHd)pZERc
zXD(tsjHDir1H)VhLO6DfJA}7oGBZCyPCC%|K}3Bd>c?@($u~^Ec{l?;n8b;*O&#7a
z?1#M&0tJHXUc81u)(2wyS|zv)eztlP4#E(O!EunVkRnHPW7>^DljnD+5Vq;CO-tCa
zDth#bo&Hv(230JyAI*3Lrmn@b8cbUUi&SF)k6MF;KwSsaO5lLWN7^Uh0wm!yYeuqa
zmxC}2qnH&N_UOLOJ`64jJW=rTG52ot<pn<)w;Vh!y%M@P4I);rcj-%sHaa~@p0D6*
z>hj_EBUhZ>2sm;Anorns;;CyUz1-`d%e`D~k}1+C!#X%Lhqw*Rw8#*#dn?;T%b?)>
zuEy}crL-s@mB6A}O}}$Wu5YBwD5c|2Wa{cDGhxu|@7au(b-uohGN;-blt8lT+k_4@
zG``Pe9ah#7oZHEJvG0qs+jim6N}JZ$YwH}#R!Mr{dOI>PQ<&-D?xl?^M~y6>9H`KA
z=`DY=Qj?kIshJnvd}Nv=x_VXYsjun(3=sK5JR788XcH#a1gjNa#`(6QsF4LBN|)xu
z?*tPI&H%<vki#@J+;msK_&LE(Q_q}>zifY$#q2{-9kmkn!VcE9vFZ`Kg(J@rHjcqA
zPDJxJiKdw~X0G9VVLd(XNIEm?rkUBs`NvF@x*e@G|H3U6HH8}`OZ-+b4!`y{8-K^)
L6{-$4$I^cQ8b1sF

delta 378
zcmdn6+x*KU^M);qR{qSU3<lE~kFz;%Z}4Zl!8E-fhEZzzx*5z#(*@iZBevUxGjd&=
zo*>S_wLL(C=@l!OIsL+Pu4(Nz^q98a&|{vIgfL>mMCLn8(+?!GiA`?^V@zuon900d
zU?z)%6T}3A+bmy@O*r(BW&5Frte5V=O_;tRo2_sAg&7=SNXASzxXo&_z2gMit^W|~
zfi8*It}}^i4#cqSK<B(;oNnOB%QF4KL3WPq2^ZMs9LH;B!t@CNENs&^Eak8R8T^j1
x{lP+x?GF}mzIl(;igutCKx?>{9K>sE8pNp?i98AKAYQ)U&-(-B%23`1?EoI_k9+_C