From a723a846516fdf237c0de61b386307460c7c8fa8 Mon Sep 17 00:00:00 2001
From: "beard%netscape.com"
 <beard%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 8 May 1999 20:36:56 +0000
Subject: [PATCH] fixed a 'MENU' resource id conflict (128 is CodeWarrior IDE's
 Apple menu)

git-svn-id: svn://10.0.0.236/trunk@30842 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../xpcom/tools/xpidl/macplugin/panel.rsrc    | Bin 15880 -> 16207 bytes
 .../xpcom/typelib/xpidl/macplugin/panel.rsrc  | Bin 15880 -> 16207 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/mozilla/xpcom/tools/xpidl/macplugin/panel.rsrc b/mozilla/xpcom/tools/xpidl/macplugin/panel.rsrc
index be88ed46475fe6e6e1cbe5bcd74cdda43358c328..e4a929230f930a73d3b3412dcba44a532ff1f164 100644
GIT binary patch
delta 664
zcmY+CO=uHA6vtmas@P)19`sVnK#-(@`BK`{G!{)#2qa6$M_cruli5ieJK0%gH>HS}
zR#DW02<u7kDqgkXMZr@&h~UkWh!lk0M7;H)Z$lJ)F#P`enD^$-dwci##~TlmQ)hnw
zzyW}T1d;#*5c6LFvUq}rpBp=~TVCc-FgP;iO=o|F;S!2dnalkr+jrjf7QUsE5XK6>
z3bvLHe!+u<|Hnj&Q*9o%xa%-#^Egvo2&LjF7`3UzWn4R&`4y$MSm!38Bw8sN%_z~_
zQ9aE#5hh{EYD>Xf5=*5sL^yqtS0-PkS_`E~sZfkM<eY6wPP*LcP5bTYd#@pc9C-Wp
zslnR-p_8jE|K6X7bk#K>B~7f`=rG|bB^}hll!-27w(NC;^>;q~;ebN1pRr^91SSJ(
za7ZwD8ud+N2Kk_rHzLT#l)D`HG;cJ@=;uYfQS<Zf8?@yhKQ$^<Kfi-{g5P`9szPgl
zeKld0krRuOc92uH=56GOO7V!%L@~owg^4`hWoy_dV0bU*RliAK?j5!P*nmlZna=~g
z2}yui+%(1}WC7-$4fF;q;+^k9eF5OiMPHAMfk1tGn0Ha{h6=AfV9#6lcicn$W`EJ@
zNa0)w`~JoUqat<g-OnYx?OY^1x>79_%A|se8n0?~l`|K2RiG|CTA?hzR3}SZJ3?8c
LHr%wgn<Kvgi0!8Q

delta 295
zcmX?K*HJUUK+bj*0|Nsm1B2}gAg#c_zzC$Qfov-vW<0df?~yrkJVV3elhz5F4J@WG
zF#*}ftp3-dDr0@U+rc;ss8fc~kAXKcImZOZE&|dPK)TM;*-sfrcO|Blqyp(_&VC_2
zKzkMihXjGdcZDP-6$9yGA-(}1@k>B)1t9-bKtO&Hkp32wnc@R<43n>`Unr2~bIVEO
zO$Rch3W`$GfVA4=J+}F*2?`8Wnv)Ie#7%R6niv=w8LWZ6;0CiB7~B{b%-%!UfeZ}h
mK~Of(L00=f?8#H?+_<?S0z6%O6nyhjQYYWCQ=Y7EuK)nGMnz-*

diff --git a/mozilla/xpcom/typelib/xpidl/macplugin/panel.rsrc b/mozilla/xpcom/typelib/xpidl/macplugin/panel.rsrc
index be88ed46475fe6e6e1cbe5bcd74cdda43358c328..e4a929230f930a73d3b3412dcba44a532ff1f164 100644
GIT binary patch
delta 664
zcmY+CO=uHA6vtmas@P)19`sVnK#-(@`BK`{G!{)#2qa6$M_cruli5ieJK0%gH>HS}
zR#DW02<u7kDqgkXMZr@&h~UkWh!lk0M7;H)Z$lJ)F#P`enD^$-dwci##~TlmQ)hnw
zzyW}T1d;#*5c6LFvUq}rpBp=~TVCc-FgP;iO=o|F;S!2dnalkr+jrjf7QUsE5XK6>
z3bvLHe!+u<|Hnj&Q*9o%xa%-#^Egvo2&LjF7`3UzWn4R&`4y$MSm!38Bw8sN%_z~_
zQ9aE#5hh{EYD>Xf5=*5sL^yqtS0-PkS_`E~sZfkM<eY6wPP*LcP5bTYd#@pc9C-Wp
zslnR-p_8jE|K6X7bk#K>B~7f`=rG|bB^}hll!-27w(NC;^>;q~;ebN1pRr^91SSJ(
za7ZwD8ud+N2Kk_rHzLT#l)D`HG;cJ@=;uYfQS<Zf8?@yhKQ$^<Kfi-{g5P`9szPgl
zeKld0krRuOc92uH=56GOO7V!%L@~owg^4`hWoy_dV0bU*RliAK?j5!P*nmlZna=~g
z2}yui+%(1}WC7-$4fF;q;+^k9eF5OiMPHAMfk1tGn0Ha{h6=AfV9#6lcicn$W`EJ@
zNa0)w`~JoUqat<g-OnYx?OY^1x>79_%A|se8n0?~l`|K2RiG|CTA?hzR3}SZJ3?8c
LHr%wgn<Kvgi0!8Q

delta 295
zcmX?K*HJUUK+bj*0|Nsm1B2}gAg#c_zzC$Qfov-vW<0df?~yrkJVV3elhz5F4J@WG
zF#*}ftp3-dDr0@U+rc;ss8fc~kAXKcImZOZE&|dPK)TM;*-sfrcO|Blqyp(_&VC_2
zKzkMihXjGdcZDP-6$9yGA-(}1@k>B)1t9-bKtO&Hkp32wnc@R<43n>`Unr2~bIVEO
zO$Rch3W`$GfVA4=J+}F*2?`8Wnv)Ie#7%R6niv=w8LWZ6;0CiB7~B{b%-%!UfeZ}h
mK~Of(L00=f?8#H?+_<?S0z6%O6nyhjQYYWCQ=Y7EuK)nGMnz-*