Return-Path: X-Original-To: apmail-cordova-dev-archive@www.apache.org Delivered-To: apmail-cordova-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 00637D27D for ; Tue, 14 May 2013 17:26:01 +0000 (UTC) Received: (qmail 85661 invoked by uid 500); 14 May 2013 17:26:00 -0000 Delivered-To: apmail-cordova-dev-archive@cordova.apache.org Received: (qmail 85607 invoked by uid 500); 14 May 2013 17:26:00 -0000 Mailing-List: contact dev-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list dev@cordova.apache.org Received: (qmail 85599 invoked by uid 99); 14 May 2013 17:26:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 May 2013 17:26:00 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of lorin.beer.dev@gmail.com designates 209.85.223.176 as permitted sender) Received: from [209.85.223.176] (HELO mail-ie0-f176.google.com) (209.85.223.176) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 May 2013 17:25:56 +0000 Received: by mail-ie0-f176.google.com with SMTP id at1so1603974iec.35 for ; Tue, 14 May 2013 10:25:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:content-type; bh=S1vvpc9AvP4inkRWRPl0/DyZ7RBJ2ErQLMC3SwY68VI=; b=uUq2JZli4Smhc0O+Spz2YhtJvzgsw0HnXpKAoz/4wZAeUkk4LU4j2bLlvD6//ZGRFb PuNjTc8bKpv1jfIJbaXuFmQ3fTXPr4SqnhRcWWq4U+CrvtXdSUSe3njkajs7wbBXGmmZ vHVqj9lZq23fd5Rp70xwqaEFN63BJ8zVgqYf2uC0cXuxeeD3sZvfltwisebMAAtFubLW qREIQp+OvtgKsgKfRzVP9uO44NaGI7zYhtkiAV+thp3llDK29R6pHZeOW6vfIb//Yvc2 vnZhNXZDnYuHFooZokbt890mEj301PCfyaJBwCTGF1WVtu9HMPoVYQYltjvPfPl59qOA 8/XQ== MIME-Version: 1.0 X-Received: by 10.50.55.70 with SMTP id q6mr2704850igp.81.1368552336261; Tue, 14 May 2013 10:25:36 -0700 (PDT) Received: by 10.64.25.163 with HTTP; Tue, 14 May 2013 10:25:36 -0700 (PDT) In-Reply-To: References: Date: Tue, 14 May 2013 10:25:36 -0700 Message-ID: Subject: Re: blackberry10 merge begun From: Lorin Beer To: dev Content-Type: multipart/alternative; boundary=047d7b10cd31dc295004dcb0eb0b X-Virus-Checked: Checked by ClamAV on apache.org --047d7b10cd31dc295004dcb0eb0b Content-Type: text/plain; charset=ISO-8859-1 looks like I pushed from the wrong branch. Not allowed to rewind, fixing this now. On Tue, May 14, 2013 at 9:57 AM, Lorin Beer wrote: > I'm not to sure what happened with docs, I'll revise right away > > > On Tue, May 14, 2013 at 7:21 AM, Bryan Higgins wrote: > >> thanks, cordova-blackberry looks good, but the docs changes didn't get >> merged in cleanly. I see merge artifacts in getting started and plugin >> development. >> >> >> On Mon, May 13, 2013 at 5:30 PM, Lorin Beer > >wrote: >> >> > yes, I believe I have resolved all the ones that were marked as ready to >> > pull in. I'm stepping out of the office, but when I'm back I'll do the >> > merge into master. >> > >> > >> > >> > On Mon, May 13, 2013 at 2:20 PM, Bryan Higgins > > >wrote: >> > >> > > Thanks Lorin! >> > > >> > > A few of those are still "in progress" as they have unresolved >> feedback >> > or >> > > are untested. >> > > >> > > I will get them closed and re-opened against master once the merge is >> > > complete. >> > > >> > > >> > > On Mon, May 13, 2013 at 5:16 PM, Lorin Beer > > > >wrote: >> > > >> > > > before the merge future/master merge happens, I'm pulling in all the >> > > > redirected pull requests >> > > > https://github.com/apache/cordova-blackberry/pulls >> > > > >> > > > and tracking the progress here: >> > > > https://issues.apache.org/jira/browse/CB-3382#comment-13656385 >> > > > >> > > >> > >> > > --047d7b10cd31dc295004dcb0eb0b--