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 04B8C11B48 for ; Mon, 5 May 2014 15:07:00 +0000 (UTC) Received: (qmail 64163 invoked by uid 500); 5 May 2014 15:06:44 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 63887 invoked by uid 500); 5 May 2014 15:06:34 -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 63433 invoked by uid 99); 5 May 2014 15:06:26 -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, 05 May 2014 15:06:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6A70A91102E; Mon, 5 May 2014 15:06:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mmocny@apache.org To: commits@cordova.apache.org Date: Mon, 05 May 2014 15:06:58 -0000 Message-Id: <6fa1921a7906461b8f71cb15e8e9bf21@git.apache.org> In-Reply-To: <51de07046c9943cb83cc14624d9decd8@git.apache.org> References: <51de07046c9943cb83cc14624d9decd8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [37/37] git commit: Merge branch 'cdvtest' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-device into cdvtest Merge branch 'cdvtest' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-device into cdvtest Conflicts: test/tests.js Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/commit/7df1e279 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/7df1e279 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/7df1e279 Branch: refs/heads/cdvtest Commit: 7df1e279795f765a79eb4792c82113293d643d7d Parents: f75e72a 36944f5 Author: Michal Mocny Authored: Mon May 5 11:04:24 2014 -0400 Committer: Michal Mocny Committed: Mon May 5 11:04:24 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------