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 17D2410A0B for ; Wed, 16 Oct 2013 23:49:00 +0000 (UTC) Received: (qmail 88595 invoked by uid 500); 16 Oct 2013 23:49:00 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 88573 invoked by uid 500); 16 Oct 2013 23:49:00 -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 88562 invoked by uid 99); 16 Oct 2013 23:48:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Oct 2013 23:48:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B8AF3916770; Wed, 16 Oct 2013 23:48:59 +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: Wed, 16 Oct 2013 23:49:01 -0000 Message-Id: <928b8450d20b42599ab745493e3b1fdf@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] spec commit: Merge branch 'CB-5104' of https://github.com/csantanapr/cordova-mobile-spec into CB-5104 Merge branch 'CB-5104' of https://github.com/csantanapr/cordova-mobile-spec into CB-5104 Conflicts: autotest/tests/device.tests.js Project: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/commit/0aadb2c6 Tree: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/tree/0aadb2c6 Diff: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/diff/0aadb2c6 Branch: refs/heads/master Commit: 0aadb2c6daa8c50ee09183d3dc2d688cdf11225b Parents: 6b2005e 07b7783 Author: Carlos Santana Authored: Wed Oct 16 17:20:26 2013 -0400 Committer: Carlos Santana Committed: Wed Oct 16 17:20:26 2013 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------