Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D679C11EB0 for ; Thu, 27 Mar 2014 14:22:49 +0000 (UTC) Received: (qmail 11905 invoked by uid 500); 27 Mar 2014 14:22:49 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 11806 invoked by uid 500); 27 Mar 2014 14:22:48 -0000 Mailing-List: contact commits-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 commits@cordova.apache.org Received: (qmail 9547 invoked by uid 99); 27 Mar 2014 14:22:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Mar 2014 14:22:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9ED1D837ED3; Thu, 27 Mar 2014 14:22:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anis@apache.org To: commits@cordova.apache.org Date: Thu, 27 Mar 2014 14:22:43 -0000 Message-Id: In-Reply-To: <05fc672c685b49e1ab868e7427456c94@git.apache.org> References: <05fc672c685b49e1ab868e7427456c94@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [34/34] js commit: Merge branch 'browserify' of https://git-wip-us.apache.org/repos/asf/cordova-js into browserify Merge branch 'browserify' of https://git-wip-us.apache.org/repos/asf/cordova-js into browserify Conflicts: package.json Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/40c4ab4a Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/40c4ab4a Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/40c4ab4a Branch: refs/heads/browserify Commit: 40c4ab4ad434df733fa048bc2caf29e2cb3a0084 Parents: 82d62c8 f4f5bb6 Author: Anis Kadri Authored: Thu Mar 27 15:21:54 2014 +0100 Committer: Anis Kadri Committed: Thu Mar 27 15:21:54 2014 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------