From 41254a926b0e93e8bf27da5db93fdef4755c8b7e Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 23 Aug 2013 20:11:42 +0400
Subject: [PATCH] Regenerate compileKotlinAgainstCustomJava testData

---
 .../duplicateLibraries/DuplicateLibTest-1.jar | Bin 1146 -> 1397 bytes
 .../duplicateLibraries/DuplicateLibTest-2.jar | Bin 1146 -> 1397 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibTest-1.jar b/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibTest-1.jar
index 747450d16a2656636db379f085c882144bc5e79d..0855961612f5340efcb6fd59e575df0d2f0d9e3b 100644
GIT binary patch
literal 1397
zcmWIWW@Zs#-~d9ah2qW(NPv@pg~8V~#8KDN&rSc|DFy~+h5&DN4v-2asImZ@nni#r
z;F^6M{XE@VgG2Ou-9G!CIql=Et9OytTUYDcne&^246YbIcv__A<*VcAd$DvC3+IfN
zl1FAsX=PZ5i9A`NRq;&qb>^p{k421N+b@V6%eMiV4Z<MXxxg;bKyy0CktM0cC7F5Y
z`Up3otCB%d6#`KmkeHmEn4YSaoRe5wtn26NeK<g1&RO^5#iHID0}eXtRT(c(=wM&j
z@rZrJ)-OsNv%hTJqf&b@?eaf!{(lVhQ-0*!J<MZ$_}rWC=bwu=ByZt}4V;=`+}oaA
z_sHb=N-l?%xjo`C;yHJZs|2rPDOg(-x?kKXHLzaYeW!pG|IA50_Dyk`{lB5u=|rd8
z%F3nQk8ka2c+eX;qhRCqYBAky-}%)yzpJRcZaw!7Pn-OgGNoS*({$HAbo*yK**iC>
zOV4(`RIPfJmA0+=@5moP*FJ~DzIGC<YQEJmZ{@^wB|$6p87|#$;~H14#fJ@Y?6bAM
zY)swB>~uKqpsv}48rD#bdPY$6N?pG$_YoK{5{!@lhNKO=L6=|PlUkOV<DZn3np^@2
zy4--=?8^Znb$)TPmS)~c-TL;`>4+JRxDOj0Txrn~G1r27@#YX0fxJuBdriIFilZ;q
ztJX<q{9yhQ_{g)g?$ZI==XTF6-`m&M{$_l@rzd<XN-Qe%ebwSWB?{t3wmr*@F7kD3
zuoC6I=*_zMdEDd&{!8D<depw#WclIbACu6|3q?n+=G9+d2~TYmi&R=KbdCLg{-+5W
zHcelm75q!^;GV)_pA~O(6M0Q5LM1+AM>M|vv_7zvb$-Ij@2eD8nv43xcRu@5r`6T8
zI@EQ|v7)dQHpZ2X?ak^=+=ps*e^rRNvOdP%F4NymuB5zwzHD#Vp$Gq-PqVLinjbR9
z|9Z*teH&kzw%z_NmH+-(`$q$n+aLZ+$mp)g+WE!8NcVbQht8(OT#^fuL(W{_`{rwG
z)*^4y>!Vz7C)Tlcab~gH_V>?)JtL%_bb1_5TIMq6RN%^r8`FQ*Ogm8<+Vt+C&E;1v
zeW43y^ls9*?(|uXwXC9?yGF9^?k9;oGY@X#>bHH}W7XsRao^#J+O}WeYw8Zlul&n>
zE6F?OZFD+^*RC~TY&vrzen)?Q6lA^Q$hMO)lP|VD&sg}EEo8xGX;9qXN?NmL6ENOw
zfcZPXn~_O`0kvd+WqVM`fC}JQ9aK)BYemkppmG5LY=KO;R-{q_WC9lh?!1jKVK<P8
z$ms|tgAy!qQU>L91b7H!!gOKF`N%#1nS>lLs3yq(!vt;;mW&YK&B_L{mlX)zfk7()
G4mki!wcAes

literal 1146
zcmWIWW@Zs#-~hstvx=P<kN_703qx^oQD#AjUUo_Gzf%khTc;e%yKTVJ_P&nm;PSHU
zGpx*Qu~ib+V#7qFud!=bbY|w9p5zc1*}d?+-Ad2dEUynbgvPQ=KJq<y${*$x+WC`I
zMNPjuUOBayYmReN)%#g>T=QIe<8t2bdb!c0?ES3JqNO<sy6Vec<uCqpE6qP@veR!7
zZS7x2W-Y3!Ul$eeyHmk6$zY2jx3x#hT9yYEkCYyXY&!SR{g_h<uefH(;w|SZ7`|Rj
z>S0X%D|5wv;`Gp?)zXOvcn>8UOZ~p`cfse6#yma=zwaN|@_MKAgxg*hCjAJWzG9`8
z-mz7CIA!l$a`6+ZEDxHTs}WHjKUpGY*IEBPN`dPqDtlhle!ePriFM<Q7>Uvtz3k@R
z?sczja$l+HoyNnp@1V@5|0R?EW?Ytjlw9*|hP<bfP-@k=vZp`)`DEHpJ?`uFQ>A^W
z@$6aowKMsvgZ2C@en0u_dP-rNE4QEDug-t74}Q0CDE*t!`)c}kq1WXbi+?KL%rAF(
zb3v=*9QQQIH&gkO?9*Sr-&S+6qPB2nsl9RC&BcBF|D<}0%1>Nczu}1<fAOz^XOZ=d
z`lcT)*qHoh2=Hd-5Z&cpvWSs^VL3Ykkk8D*1&-4#vr%K011MUOT3nKum#z;|1xW*E
z(9(bmlB$sW0-w~f)Exh$tkmQZz2uz4;^NYP(_YMmBDOETnAT=Qzdilj%`w*E#WvRo
zT>+8-AzXTw4Ru#0FY_^CwfBw@5&6Sl@3qHxsr1DIzVG&0exEbBrgncllf_X!=ffPi
zOQfv7AG{)J{4kzh{gAPxLEEX8^E)0F?}{zcZTsXR@!V@hs`lXtdpnjL_iszQ-m8Du
zL-MDN%x5Ffpx!2lyPtPnlVyuOz44J67pwExzq$?$XHGm%&Yielx{XQxR3pb$o{&3=
zrO{fsJ3bweb3Xm|w#~+r-9etk#}Z^^_$0pl|1K&JFHxz+VZG61UyD{2>yp6q6Xmw{
z4>c89t2kG$xG`m`<fXk2CdOUZ7aPF0WSVpQ9BomFyc28H-j_RyR6Pp%#iVXBmF?!D
zjN>LtrYxGX<i(vOtGq-P8yB0nKNkIXYmr7!aqprV$E|WqIL`~!On&w#^pC@<#J+3N
zW@5pbIqKDVGuI2-@OST%ZJn{CrAS`e9u$-Pm)IPmfHBF)1d2&UCJ_ciPDPGoP)<b!
zsQDJ8mx}>+IzZ^X2eb{5DiAh;(gm_>K<NSjSb*+>>B5#u0=!w-K&qL6a1W4P!3^R7
E004ft8vp<R

diff --git a/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibTest-2.jar b/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibTest-2.jar
index 5baf91e9a0a46d9038af123bee22d5cbaa91cfac..0855961612f5340efcb6fd59e575df0d2f0d9e3b 100644
GIT binary patch
literal 1397
zcmWIWW@Zs#-~d9ah2qW(NPv@pg~8V~#8KDN&rSc|DFy~+h5&DN4v-2asImZ@nni#r
z;F^6M{XE@VgG2Ou-9G!CIql=Et9OytTUYDcne&^246YbIcv__A<*VcAd$DvC3+IfN
zl1FAsX=PZ5i9A`NRq;&qb>^p{k421N+b@V6%eMiV4Z<MXxxg;bKyy0CktM0cC7F5Y
z`Up3otCB%d6#`KmkeHmEn4YSaoRe5wtn26NeK<g1&RO^5#iHID0}eXtRT(c(=wM&j
z@rZrJ)-OsNv%hTJqf&b@?eaf!{(lVhQ-0*!J<MZ$_}rWC=bwu=ByZt}4V;=`+}oaA
z_sHb=N-l?%xjo`C;yHJZs|2rPDOg(-x?kKXHLzaYeW!pG|IA50_Dyk`{lB5u=|rd8
z%F3nQk8ka2c+eX;qhRCqYBAky-}%)yzpJRcZaw!7Pn-OgGNoS*({$HAbo*yK**iC>
zOV4(`RIPfJmA0+=@5moP*FJ~DzIGC<YQEJmZ{@^wB|$6p87|#$;~H14#fJ@Y?6bAM
zY)swB>~uKqpsv}48rD#bdPY$6N?pG$_YoK{5{!@lhNKO=L6=|PlUkOV<DZn3np^@2
zy4--=?8^Znb$)TPmS)~c-TL;`>4+JRxDOj0Txrn~G1r27@#YX0fxJuBdriIFilZ;q
ztJX<q{9yhQ_{g)g?$ZI==XTF6-`m&M{$_l@rzd<XN-Qe%ebwSWB?{t3wmr*@F7kD3
zuoC6I=*_zMdEDd&{!8D<depw#WclIbACu6|3q?n+=G9+d2~TYmi&R=KbdCLg{-+5W
zHcelm75q!^;GV)_pA~O(6M0Q5LM1+AM>M|vv_7zvb$-Ij@2eD8nv43xcRu@5r`6T8
zI@EQ|v7)dQHpZ2X?ak^=+=ps*e^rRNvOdP%F4NymuB5zwzHD#Vp$Gq-PqVLinjbR9
z|9Z*teH&kzw%z_NmH+-(`$q$n+aLZ+$mp)g+WE!8NcVbQht8(OT#^fuL(W{_`{rwG
z)*^4y>!Vz7C)Tlcab~gH_V>?)JtL%_bb1_5TIMq6RN%^r8`FQ*Ogm8<+Vt+C&E;1v
zeW43y^ls9*?(|uXwXC9?yGF9^?k9;oGY@X#>bHH}W7XsRao^#J+O}WeYw8Zlul&n>
zE6F?OZFD+^*RC~TY&vrzen)?Q6lA^Q$hMO)lP|VD&sg}EEo8xGX;9qXN?NmL6ENOw
zfcZPXn~_O`0kvd+WqVM`fC}JQ9aK)BYemkppmG5LY=KO;R-{q_WC9lh?!1jKVK<P8
z$ms|tgAy!qQU>L91b7H!!gOKF`N%#1nS>lLs3yq(!vt;;mW&YK&B_L{mlX)zfk7()
G4mki!wcAes

literal 1146
zcmWIWW@Zs#-~hstvx=P<kN_703qx^oQD#AjUUo_Gzf%khTc;e%yKTVJ_P&nm;PSHU
zGpx*Qu~ib+V#7qFud!=bbY|w9p5zc1*}d?+-Ad2dEUynbgvPQ=KJq<y${*$x+WC`I
zMNPjuUOBayYmReN)%#g>T=QIe<8t2bdb!c0?ES3JqNO<sy6Vec<uCqpE6qP@veR!7
zZS7x2W-Y3!Ul$eeyHmk6$zY2jx3x#hT9yYEkCYyXY&!SR{g_h<uefH(;w|SZ7`|Rj
z>S0X%D|5wv;`Gp?)zXOvcn>8UOZ~p`cfse6#yma=zwaN|@_MKAgxg*hCjAJWzG9`8
z-mz7CIA!l$a`6+ZEDxHTs}WHjKUpGY*IEBPN`dPqDtlhle!ePriFM<Q7>Uvtz3k@R
z?sczja$l+HoyNnp@1V@5|0R?EW?Ytjlw9*|hP<bfP-@k=vZp`)`DEHpJ?`uFQ>A^W
z@$6aowKMsvgZ2C@en0u_dP-rNE4QEDug-t74}Q0CDE*t!`)c}kq1WXbi+?KL%rAF(
zb3v=*9QQQIH&gkO?9*Sr-&S+6qPB2nsl9RC&BcBF|D<}0%1>Nczu}1<fAOz^XOZ=d
z`lcT)*qHoh2=Hd-5Z&cpvWSs^VL3Ykkk8D*1&-5=vr%K011MUOT3nKum#z;|1xW*E
z(9(bmlB$sW0-w~f)Exh$tkmQZz2uz4;^NYP(_YMmBDOETnAT=Qzdilj%`w*E#WvRo
zT>+8-AzXTw4Ru#0FY_^CwfBw@5&6Sl@3qHxsr1DIzVG&0exEbBrgncllf_X!=ffPi
zOQfv7AG{)J{4kzh{gAPxLEEX8^E)0F?}{zcZTsXR@!V@hs`lXtdpnjL_iszQ-m8Du
zL-MDN%x5Ffpx!2lyPtPnlVyuOz44J67pwExzq$?$XHGm%&Yielx{XQxR3pb$o{&3=
zrO{fsJ3bweb3Xm|w#~+r-9etk#}Z^^_$0pl|1K&JFHxz+VZG61UyD{2>yp6q6Xmw{
z4>c89t2kG$xG`m`<fXk2CdOUZ7aPF0WSVpQ9BomFyc28H-j_RyR6Pp%#iVXBmF?!D
zjN>LtrYxGX<i(vOtGq-P8yB0nKNkIXYmr7!aqprV$E|WqIL`~!On&w#^pC@<#J+3N
zW@5pbIqKDVGuI2-@OST%ZJn{CrAS`e9u$-Pm)IPmfHBF)1d2&UCJ_ciPDPGoP)<b!
zsQDJ8mx}>+IzZ^X2eb{5DiAh;(gm_>K<NSjSb*+>>B5#u0=!w-K&qL6a1W4P!3^R7
E0QVcX6#xJL