From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <sven.eckelmann@gmx.de>
From: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Sun, 20 Jun 2010 22:13:46 +0200
References: <1277053035-26751-1-git-send-email-sven.eckelmann@gmx.de>
In-Reply-To: <1277053035-26751-1-git-send-email-sven.eckelmann@gmx.de>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="nextPart2108209.ivVuuVBnM6";
	protocol="application/pgp-signature"; micalg=pgp-sha512
Content-Transfer-Encoding: 7bit
Message-Id: <201006202213.48253.sven.eckelmann@gmx.de>
Subject: Re: [B.A.T.M.A.N.] [PATCH] batctl: Merge differences between
	v2010.0.0
Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking
	<b.a.t.m.a.n@lists.open-mesh.org>
List-Id: The list for a Better Approach To Mobile Ad-hoc Networking
	<b.a.t.m.a.n.lists.open-mesh.org>
List-Unsubscribe: <https://lists.open-mesh.org/mm/options/b.a.t.m.a.n>,
	<mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=unsubscribe>
List-Archive: <http://lists.open-mesh.org/pipermail/b.a.t.m.a.n>
List-Post: <mailto:b.a.t.m.a.n@lists.open-mesh.org>
List-Help: <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=help>
List-Subscribe: <https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n>,
	<mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=subscribe>
To: b.a.t.m.a.n@lists.open-mesh.org

--nextPart2108209.ivVuuVBnM6
Content-Type: Text/Plain;
  charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Sven Eckelmann wrote:
> batctl started to diverge when the batctl-0.2.x (later batctl-maint) was
> created. Even when not all changes inside the batctl branch has to be in
> the batctl-maint branch, it must be ensured that all changes in
> batctl-maint are also part of batctl.
>=20
> Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
> ---

It seems that some changes from maint and master must be merged by hand. I=
=20
will send an updated patch later.

Best regards,
	Sven

--nextPart2108209.ivVuuVBnM6
Content-Type: application/pgp-signature; name=signature.asc 
Content-Description: This is a digitally signed message part.

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

iQIcBAABCgAGBQJMHnZ7AAoJEF2HCgfBJntG6SMP/ja93T7eXItPQLjEKUSKS6CY
Di5xsKRXLFF2oubeTQtML7Rxm6rZkVfh5RsiHTV/LSIV8wsEDPMVS415MubGfBKb
v/nnd5Ss43SHp0xMdAjbgNMCdgr8ZH29rrNbi05VhoHL5EkbYTdh0pzhA+Q3trsl
3D37e4+X0r4TmmzpUC+HTP3ANZxlUzfAkqW8+GjAv/XLFCzgfejRGqE4PyOHLVpX
KBVJL/zbeO2HwI6LDjFaU+VH1wxSHn7HC0dcNMQZDE6Rc9PdY7PjhvP/aJGdy29F
Jksfn6LxfHoZLNSJKq7ZfoMsSc8Nq5gpodXHkwtSh9GfyqBTh8F/s8Gc0inVT0nM
IwaZdhH6qcf6pKfz0cAlcq7/jfeIFcpljDQE37x6kE2WLfeEFdPM8mFveuielWo8
hveBBHmgn17roIteUJGgbNsTuqdQS90xj96lxoo7O8wurtWvStZZeArJnWvagGN/
pvIO9RrmwkAT7tptkH+rASgeUE9ofvW5c5vWPBZDbddEn4VxBhI5CzEau8s3Aboh
B5Du4fTkg5JOZOJEJeVJgj018rNCftE5xuQx8tg6AUoajyL/S3wv8SxILmFwsnCG
0pDZRHjVP9LApCXh8rkJoDlR2tdzPV2lQX3RfG2QliwQDU9/Ji9y6lUtScnm4vtw
6HDLlju7ow6Yg4uGnjKe
=L4Eb
-----END PGP SIGNATURE-----

--nextPart2108209.ivVuuVBnM6--