Return-Path: X-Original-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 11A939588 for ; Mon, 9 Apr 2012 22:43:09 +0000 (UTC) Received: (qmail 15875 invoked by uid 500); 9 Apr 2012 22:43:09 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 15849 invoked by uid 500); 9 Apr 2012 22:43:09 -0000 Mailing-List: contact callback-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@incubator.apache.org Delivered-To: mailing list callback-commits@incubator.apache.org Received: (qmail 15840 invoked by uid 99); 9 Apr 2012 22:43:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Apr 2012 22:43:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AD46BBED4; Mon, 9 Apr 2012 22:43:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: purplecabbage@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/5] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-js Message-Id: <20120409224308.AD46BBED4@tyr.zones.apache.org> Date: Mon, 9 Apr 2012 22:43:08 +0000 (UTC) Updated Branches: refs/heads/master ddf40695d -> e79df00ee Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-js Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/commit/e79df00e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/e79df00e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/e79df00e Branch: refs/heads/master Commit: e79df00ee2a146b39b09aa3d2952ae9e2d28b60b Parents: 8e9306d ddf4069 Author: Jesse MacFadyen Authored: Mon Apr 9 15:42:00 2012 -0700 Committer: Jesse MacFadyen Committed: Mon Apr 9 15:42:00 2012 -0700 ---------------------------------------------------------------------- lib/common/channel.js | 38 +++++++++++++++++++++++++++++++++++--- 1 files changed, 35 insertions(+), 3 deletions(-) ----------------------------------------------------------------------