From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <at@altlinux.ru>
Date: Thu, 25 Sep 2008 06:27:09 +0000
From: Alexey Tourbin <at@altlinux.ru>
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
Message-ID: <20080925062709.GV839@altlinux.org>
Mail-Followup-To: ALT Linux Team development discussions
	<devel@lists.altlinux.org>
References: <774a4f4a0809242247g27d2bd86u79b1771b4047688c@mail.gmail.com>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="0WGqsT62A4RTsSXf"
Content-Disposition: inline
In-Reply-To: <774a4f4a0809242247g27d2bd86u79b1771b4047688c@mail.gmail.com>
Subject: Re: [devel] =?koi8-r?b?y8HLIMTF0tbB1NggYmFja3BvcnRzINcgZ2l0?=
X-BeenThere: devel@lists.altlinux.org
X-Mailman-Version: 2.1.10b3
Precedence: list
Reply-To: ALT Linux Team development discussions <devel@lists.altlinux.org>
List-Id: ALT Linux Team development discussions <devel.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel>
List-Post: <mailto:devel@lists.altlinux.org>
List-Help: <mailto:devel-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Sep 2008 06:27:10 -0000
Archived-At: <http://lore.altlinux.org/devel/20080925062709.GV839@altlinux.org/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>


--0WGqsT62A4RTsSXf
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Sep 25, 2008 at 08:47:27AM +0300, Artem Zolochevskiy wrote:
> =EB=C1=CB =CD=CE=C5 =D4=C5=D0=C5=D2=D8 =C4=C5=CC=C1=D4=D8 backport =D7=C5=
=D2=D3=C9=C9 3.0-alt1?
> git-pull . tag 3.0-alt1
> (=C9=CC=C9 git-merge master =C9=CC=C9 git-merge 3.0-alt1)
> =D0=CF=CC=D5=DE=C9=CC =CB=CF=CE=C6=CC=C9=CB=D4=D9.
> =F5 =CD=C5=CE=D1 =D0=CF=CC=D5=DE=C9=CC=CF=D3=D8 =DE=D4=CF-=D4=CF =D7=D2=
=CF=C4=C5
> <<<<<<< HEAD:example.spec
> Version: 2.0
> Release: alt0.M41.1
> =3D=3D=3D=3D=3D=3D=3D
> Version: 3.0
> Release: alt1
> >>>>>>>f6aa1fa14e5329d1490b5c0c88526e1e4759a309:example.spec

=F2=C1=DA=D2=C5=DB=C9=D4=D8 =CB=CF=CE=C6=CC=C9=CB=D4 =D3=CC=C5=C4=D5=DD=C9=
=CD =CF=C2=D2=C1=DA=CF=CD:
Version: 3.0
Release: alt0.M41.1

> <<<<<<< HEAD:example.spec
> * Thu Sep 25 2008 Artem Zolochevskiy <azol@altlinux.ru> 2.0-alt0.M41.1
> - build for 4.1 branch (2.0-alt1)
> =3D=3D=3D=3D=3D=3D=3D
> * Thu Sep 25 2008 Artem Zolochevskiy <azol@altlinux.ru> 3.0-alt1
> - version 3.0
> >>>>>>> f6aa1fa14e5329d1490b5c0c88526e1e4759a309:example.spec

=F2=C1=DA=D2=C5=DB=C9=D4=D8 =CB=CF=CE=C6=CC=C9=CB=D4 =D3=CC=C5=C4=D5=DD=C9=
=CD =CF=C2=D2=C1=DA=CF=CD (=D3=CF=C8=D2=C1=CE=C9=D7 =D7=D3=C5 =D3=D4=C1=D2=
=D9=C5 =DA=C1=D0=C9=D3=C9
=D7 changelog'=C5, =C1 =D4=C1=CB=D6=C5 =C4=CF=C2=C1=D7=C9=D7 =CE=CF=D7=D5=
=C0, =D3=CF=CF=D4=D7=C5=D4=D3=D4=D7=D5=C0=DD=D5=C0 =C2=C5=CB=D0=CF=D2=D4=D5=
):
* Thu Sep 25 2008 Artem Zolochevskiy <azol@altlinux.ru> 3.0-alt0.M41.1
- build for 4.1 branch
* Thu Sep 25 2008 Artem Zolochevskiy <azol@altlinux.ru> 3.0-alt1
- version 3.0
* Thu Sep 25 2008 Artem Zolochevskiy <azol@altlinux.ru> 2.0-alt0.M41.1
- build for 4.1 branch (2.0-alt1)

=F0=CF=D3=CC=C5 =DC=D4=CF=C7=CF =D3=C4=C5=CC=C1=D4=D8 =C5=C4=C9=CE=D9=CA me=
rge commit:
gear-commit -a

=F4=CF =C5=D3=D4=D8 =C9=D3=D4=CF=D2=C9=D1 =C2=D5=C4=C5=D4 =D4=C1=CB=CF=CA:

* [altlinux-4.1] 3.0-alt0.M41.1
|`* [master] 3.0-alt1
* | 2.0-alt0.M41.1
 `* 2.0-alt1

--0WGqsT62A4RTsSXf
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkjbLz0ACgkQfBKgtDjnu0Z62QCglVqqdfEE8EGgP+Fxt3FKyy0+
Tn0AnjPJZnrggkoCTek/LZDeioOwF/pK
=JsoG
-----END PGP SIGNATURE-----

--0WGqsT62A4RTsSXf--