From 415eb197d83b54d88380b3d040bb8aaa1c8cbe21 Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Thu, 1 Oct 1998 21:49:31 +0000 Subject: [PATCH] Fix to not merge 'cfrg' resources in Moz_resources and mozdark_resources (again). Added CRDFToolbar and CRDFToolbarContainer. git-svn-id: svn://10.0.0.236/trunk@11707 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/cmd/macfe/projects/client/Client.mcp | Bin 346156 -> 328602 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mozilla/cmd/macfe/projects/client/Client.mcp b/mozilla/cmd/macfe/projects/client/Client.mcp index 97d75d270673ec2b245dd4ad59c4b98539a2e325..2369939e2ab2d41ca3efa739e239262fd7779139 100644 GIT binary patch delta 4571 zcmYk=e^eCL6$kM5-s~)khymq?BEq5|hzNuNV*LS%0xM_;qEU&_WnFa*@?%AXpg@kX z+B7D`O?*j=wkK^;o2Dtcr%sa=Yi!a)6N~txMM7tL-*&(zL_Dz+j9nkDTKrYiL%-SGa1H(0tE>^>C$9yo&>lhD z2tBg>1D;7kD2}KMOM;W(6qo{2p%bRTsc;%hhZ%4>%!FBR25AjpHWD+HT4*kEke>x} zVIItf1@J4d5Ej8=h$W2cgInHyJxQ<{sDX)Vj>tO zg8c~jes}_&ghBXYcuJ{lpbesWh^I%=OsE%z>=@$nGikpV44cD9-PPRQY<}Gl=-@3& z`Oy$hF=ufA>C;Ma3yy|$5@m04cedzh|-$jgd$KEqz z^ZZyP46A@)6)?;?!>qFl=-^lIA{>I3;AMCPUWLC_YGahb{Jb@Rzd^w;yr$H~BEAks z;79Odcta^d7xG)=Z^BRDr|@_1_Z6-Q*5>vZ5^CMcCol8VG#Z#cA&m)Pqlo`(DbHW# z#Z<N*TM$UoE82s66@e2a6Q}r@h0Gnh&^y4^ukSWGu#4wa4USY!c}a} z3U5MU8*GLxuobo`wFWtGl_#5Hw+k&DVNXzkqsiCU>h^E<(lex^;4#<*cf&nO@oHEH zi4kT8elPvNV4B%ZFQw2NcH?usm32M;`<|9X0^$ zf1vE2O6{v*QVS`TurpRakq9-qGZ44;xTXY`w1OMrNzii4r&mhTl-C=xC*$)pNqcT$Id% z^Wg$m3d`U^SPn-lOPE-U#1dEutDp-mh1HfadYGr#=sjC(6b$o7KEuJ7_3)6h%nC9G z=EGb|x$zpWcF}UMmKA9?)1);?qyuprw8on9)(e3QEhn4RF2A_Or}t1g66My0NpTcn zYhR=|0kO3KQEY8MEN-khvo~jlSoIy=I2yq1tE|;SUKH9b!urSnc8|RU-Zh55lM6 zGq4XHvXpl|=9%=i7JpIU%p2TuKlN^{mq<(l{eQul7Lr~8>hCsVw?Cu9dUlCjlCiyF zmW})E zZXq-Bbe9;&k*#@pyvENRHV)+J-w=GYj4RL^_!-$+KzZ%TS>r%~o*^{baUuH)^(7G^ zA%QwwZQL!?+cb@NI*is5eN#kI;XJx-dTeQ%;?sk4d_vuV?+N+0QvGRBR4#kV^!UlV zIGP$Ks=`m!(eayBA)lQg`^)siNtqPps^-h*srjd>`MqT0W|@9eXuP0M_Ll3pBDvY< JFV}b5{tGD!)WHA% delta 4339 zcmY+|d016t9tZGuIlx8GP?1e#Q4kaahYaZv5gP$72wqW3L{z*ifouYqJFVj^nbCE6 zo6N?iaY~z}pgYqkCkrccX-b{xHrxKN}wD6;a3IxyQ3QHQYOpo#fzKt+$>@`TsEj7`xLGJ2KT7uu*{73HTZVR^(w{AW0qMh)bT9YO`->&f!j~>$s8yHd)_l@O1UwXELjl?lL;hIX9Q? zI14U>i?re(;vD!(*shf`U^enPR*O%_vF&u)aHIv4a1=D4KMc?c6R`sZ!Xa9@7?#2% zs0V4q8)SiXU%@C0Md5YC!{BW&1df1VaHOru?vasBT!eU2*Tg>fC439+hi}7ov=W~o zD^+KYOr*yncIXO=f}`PB=o_6F#IZ0Aj)UW2JWPNSU?NO{6Ulb#@k~M@Su1_xl7jqX zmU0aR9yx--AzU*>pGy z-UVmFJU9mykoH3;L}D&1g2iwibiw(sL@Rxxg-OYLlkwN+D}zg6Ib4?KY_}KRawJy3 z3b+#D$%yw6S3=(tszzK3>)){5t5pIH;v5l~Yk$3<;2p@ru!e78G@K;*#XZQ;I0N&I}%n7+7zhse%_IK;$H@v7q zJ$qV)2h%>d2#t5EcTUSxYwPOJ8TKUfXvJQ57`}-5cKBQP6zWIdQFvJ^G26t4$p0OF zM3<=Q&*=SA=_K>b@!uhS2JV2*!kzFr_g*coRLWT#j!zS80hD0 zY-_asQV=-7K3f&>g^Z4*WA`KN+l#O0@;oYAgWQes0r)P&-XeWV*SGQxqK^5+4k5;5 zU>IzM!Dbj-hQVbYq5osje!j<%_yqm~ehNQ>Ct#0OhG~WG_>-ugf}f)=0`X~h2A<7x zmf3sH7fAGKh3`W8kUt0e;dyugUWAvRp5E$%UKtZd5BMvj^>b%z0P)wh%D+!$P#Yhr z(|i~Vfx~rMd7q4(NNr<~9t)#k42-o^FZ9V68eNVh#*0uchS<=#3-Nqd0vEuA5Ss(P z8}U7GF)W2kpfzi((dA2#D2L17a<~Fkz?IMqD`6F^hBfeBSPSdmsyt_gHM+bWi3ZpR zn_x3st(6t(hjVfaEjoU`ol(*KGS(WP^=RAxH^NQ2ZF#?p8BSj$z5&^+)7$81Zm74$&PB|m zJ$>n*(?|QQt*>aa&h4j<5gBkA%!GH^s#ng-D4IiJI?`Ei2F!*tVGhJMjrcj@GjKM{ zh52v}bix8yNQzuTIWNdKgKj3vY`h=?`9yli_7#(ptyVGxPJyYmYS%?s=%liJ!=yjT z_QR#vfjAU$Xz!#{mxv8pHT9C5&`#+ylTTL`HvrTnb-Xom!*1lLOVd9F%bc^@~ZiSD-ZLkAAX{)APk%_bj z#Xogeb49wXIZ&WJz9J(gJB#y|FIYHhp*a3^j_A81mL@fGr0og`3K`f{+tA$9(iYoN z)mqhN)eTkK!V}F&dyE^|yvF)%IFx=<>ldA|TAl6U@#^hpk!d+Ya#UIezQdQ0P1TVes(jQirs+Qd_9#20!p5mjr z{?JLP(in$DD*C1o9+^yGsxE(el*)h8<=k$w_@=Q_NHITM See;u%Dk{gB(YK6^#(x3OdC&a-