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 C213F17379 for ; Tue, 7 Oct 2014 21:52:13 +0000 (UTC) Received: (qmail 91818 invoked by uid 500); 7 Oct 2014 21:52:13 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 91733 invoked by uid 500); 7 Oct 2014 21:52:13 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 91717 invoked by uid 99); 7 Oct 2014 21:52: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; Tue, 07 Oct 2014 21:52:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 67F649058E5; Tue, 7 Oct 2014 21:52:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: purplecabbage@apache.org To: commits@cordova.apache.org Date: Tue, 07 Oct 2014 21:52:14 -0000 Message-Id: <927dd8da70014f94b58fc2dd5b32bc1a@git.apache.org> In-Reply-To: <8400e0e61a344e3faaa853672abd1bef@git.apache.org> References: <8400e0e61a344e3faaa853672abd1bef@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'CB-7656' of https://github.com/MSOpenTech/cordova-windows Merge branch 'CB-7656' of https://github.com/MSOpenTech/cordova-windows Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/59f7dba0 Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/59f7dba0 Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/59f7dba0 Branch: refs/heads/master Commit: 59f7dba0902a12ce4a96f950dfa38d336855e9db Parents: c27396c 26c670b Author: Jesse MacFadyen Authored: Tue Oct 7 14:52:02 2014 -0700 Committer: Jesse MacFadyen Committed: Tue Oct 7 14:52:02 2014 -0700 ---------------------------------------------------------------------- template/cordova/lib/list-devices.bat | 10 ++-- template/cordova/lib/list-emulator-images.bat | 10 +++- template/cordova/lib/list-started-emulators.bat | 2 +- template/cordova/lib/target-list.js | 49 ++++++++++++++++++++ 4 files changed, 63 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org