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 19403105A1 for ; Fri, 23 Aug 2013 22:18:11 +0000 (UTC) Received: (qmail 36690 invoked by uid 500); 23 Aug 2013 22:18:11 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 36667 invoked by uid 500); 23 Aug 2013 22:18:11 -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 36660 invoked by uid 99); 23 Aug 2013 22:18:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Aug 2013 22:18:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BB37A8C4379; Fri, 23 Aug 2013 22:18:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: steven@apache.org To: commits@cordova.apache.org Date: Fri, 23 Aug 2013 22:18:11 -0000 Message-Id: <4a72722d6b9449b690de3ff7cf4316a1@git.apache.org> In-Reply-To: <73a36aa5f2f047c6b2749162f5de1ae6@git.apache.org> References: <73a36aa5f2f047c6b2749162f5de1ae6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'master' of github.com:jlongster/cordova-plugman into ffos Merge branch 'master' of github.com:jlongster/cordova-plugman into ffos Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/0192d1ab Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/0192d1ab Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/0192d1ab Branch: refs/heads/ffos Commit: 0192d1ab291b1f1c278e168be866d87a4c286dec Parents: 2ea4ddd 939ed3d Author: Steven Gill Authored: Fri Aug 23 15:17:19 2013 -0700 Committer: Steven Gill Committed: Fri Aug 23 15:17:19 2013 -0700 ---------------------------------------------------------------------- src/platforms.js | 3 ++- src/platforms/firefoxos.js | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) ----------------------------------------------------------------------