Message-ID: <4B82472C.9010606@...1114...> Date: Mon, 22 Feb 2010 09:58:20 +0100 From: David Sommerseth MIME-Version: 1.0 References: <4B7AE8D6.3020304@...1114...> <7bb795fd1002170946u40bb0ea7rea4bbf710eaa0daa@...278...> <7bb795fd1002181345t20918e0fqbecb14fe92835094@...278...> <4B7E72B0.3070701@...1114...> <7bb795fd1002190329r7fba94fcnfba4453b9e22b2c1@...278...> <7bb795fd1002210356q14fba98i4ac26561d4f7489@...278...> In-Reply-To: <7bb795fd1002210356q14fba98i4ac26561d4f7489@...278...> Subject: Re: [Openvpn-devel] openvpn-testing tree available List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit To: JuanJo Ciarlante Cc: Openvpn-devel@lists.sourceforge.net, James Yonan -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 21/02/10 12:56, JuanJo Ciarlante wrote: > Hey David, > > On Fri, Feb 19, 2010 at 12:29 PM, JuanJo Ciarlante wrote: > I've created an feat_ipv6_transport branch where I'll track your > patches. Gert's IPv6 patches are in feat_ipv6_payload (which are also > merged into the allmerged branch). I've started the discussion about > the merge conflict in another mail thread. >>> >>> Coooool ! , tnx a lot. >>> > > It's all pushed out to the openvpn-testing.git, so please feel free to > update me when you have solved these issues or have other updates! > >> I've added a new openvpn-testing-allmerged+jjo-ipv6 branch with the >> conflict resolved at git://github.com/jjo/openvpn-ipv6, it should cleanly >> fast-forward allmerged's head. > >> Thanks again for all your work on this! Pulled and merged into allmerged :) Kind regards, David Sommerseth -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ iEYEARECAAYFAkuCRywACgkQDC186MBRfrokcQCdH7YDG738UpkskOTZzYp7uS+g qKQAn0NIBt0HvcY/DPidiNGbGzA1/jhQ =odV8 -----END PGP SIGNATURE-----