From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Virus-Scanned: amavisd-new at localhost Message-ID: <4BA3EDE2.7070705@solin.spb.ru> Date: Sat, 20 Mar 2010 00:34:26 +0300 From: Aleksey Avdeev User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; ru; rv:1.9.1.5pre) Gecko/20091019 Thunderbird/3.0pre MIME-Version: 1.0 To: ALT Linux Team development discussions References: <3f60a831003182231x4725aa1aj129ce2125e629140@mail.gmail.com> In-Reply-To: <3f60a831003182231x4725aa1aj129ce2125e629140@mail.gmail.com> X-Enigmail-Version: 0.97a Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig1AEB93E6F1A76F0E7F9D26AF" Subject: Re: [devel] =?koi8-r?b?68HLIM/Czs/XydTYIGxpYnZpcnQ=?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Mar 2010 21:34:43 -0000 Archived-At: List-Archive: List-Post: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig1AEB93E6F1A76F0E7F9D26AF Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: quoted-printable 19.03.2010 08:31, Alexey Borovskoy =D0=C9=DB=C5=D4: > =E4=CF=C2=D2=D9=CA =C4=C5=CE=D8. >=20 > =F0=D2=C9 =D0=CF=D0=D9=D4=CB=C5 =CF=C2=CE=CF=D7=C9=D4=D8 libvirt >=20 > $ git merge v0.7.7 > Auto-merging .gitignore > CONFLICT (content): Merge conflict in .gitignore > Auto-merging autogen.sh > CONFLICT (content): Merge conflict in autogen.sh > Auto-merging bootstrap > CONFLICT (content): Merge conflict in bootstrap > Auto-merging configure.ac > Auto-merging daemon/libvirtd.init.in > Removing po/Makevars > Auto-merging po/ru.po > Auto-merging src/openvz/openvz_conf.c > Auto-merging src/openvz/openvz_conf.h > CONFLICT (content): Merge conflict in src/openvz/openvz_conf.h > Auto-merging src/openvz/openvz_driver.c > Auto-merging src/qemu/qemu_conf.c > Auto-merging src/xen/proxy_internal.c > Automatic merge failed; fix conflicts and then commit the result. >=20 > =F7=C5=D4=CF=CB =D3 =D0=C1=D4=DE=C1=CD=C9 =CB=C1=CB =D7=D3=C5=C7=C4=C5 = =CE=C5=D4. =EE=C1=CA=D4=C9 =D7 =C7=D2=D5=C4=C5 =CB=CF=CD=CD=C9=D4=CF=D7 =C9= =CD=C5=CE=C5=CE=C9=D1, > =CB=CF=D4=CF=D2=D9=C5 =D0=D2=C9=CB=CC=C1=C4=D9=D7=C1=CC=C9 =CB =C1=D0=D3= =D4=D2=C9=CD=CE=CF=CD=D5 =C4=C5=D2=C5=D7=D5 =D0=D2=C1=CB=D4=C9=DE=C5=D3=CB= =C9 =CE=C5=D7=CF=DA=CD=CF=D6=CE=CF. > =EB=C1=CB =D6=C5 =CD=CE=C5 =CF=C2=CE=CF=D7=C9=D4=D8 =D0=C1=CB=C5=D4 =D4= =CF? =F7=CF=D4 =D4=C1=CB=CF=C5 (=C2=D2=C1=CE=DE master) =CE=C1=DE=C1=CC=CF =D3=CF=C2=C9=D2=C1=D4=D8=D3=D1= =2E PS: =EF=D4=D2=D9=D7 git =C9 rsync =D7 ALT/fix/bootstrap (=D3=CD. ) --=20 =F3 =D5=D7=C1=D6=C5=CE=C9=C5=CD. =E1=CC=C5=CB=D3=C5=CA. --------------enig1AEB93E6F1A76F0E7F9D26AF Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJLo+3qAAoJED0KZX1FX4J6wl0H/3MKyv9/kFPH/F4HAj4JOA7K 373ihTPFV96xAUI2R/xCfzjxwGSzBOlhnBKcA6jcQR8bei3Oa1w7JutjsrZrcI/b ki2WZ6fgmAXlZgYjidHhSemDRx/Q2u3KmyExONgNpEq5wbyBdEbW1BOZszaqD8bU pNUmzSmNaOEFEOvbR484DiwKmHxV6YTnGikuMo/ajoT05hOZ/jAZoIEC5+wwYfx3 s2XY+4BTttIR39zTs8jFvIg6o9l7QHdlQxN9mjCtAzfiOys24UZT+qcf405Zb+LT WEsjl79R0OIdmv7MewXE04bx6EJjACJJEmecrebsxvSSBPjP7brPQ9DD2XLfh1s= =sD1P -----END PGP SIGNATURE----- --------------enig1AEB93E6F1A76F0E7F9D26AF--