Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 354A9200C02 for ; Fri, 20 Jan 2017 14:00:44 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 33D83160B55; Fri, 20 Jan 2017 13:00:44 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 83652160B39 for ; Fri, 20 Jan 2017 14:00:43 +0100 (CET) Received: (qmail 26112 invoked by uid 500); 20 Jan 2017 13:00:38 -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 26100 invoked by uid 99); 20 Jan 2017 13:00:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jan 2017 13:00:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4D6C7DFB0E; Fri, 20 Jan 2017 13:00:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: daserge@apache.org To: commits@cordova.apache.org Message-Id: <8a75d0f8f40640dba7219f03d7c9076b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cordova-plugin-media-capture git commit: CB-12353 Corrected merges usage in plugin.xml Date: Fri, 20 Jan 2017 13:00:37 +0000 (UTC) archived-at: Fri, 20 Jan 2017 13:00:44 -0000 Repository: cordova-plugin-media-capture Updated Branches: refs/heads/master 925b3a0a9 -> 5f271e67c CB-12353 Corrected merges usage in plugin.xml Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/commit/5f271e67 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/tree/5f271e67 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/diff/5f271e67 Branch: refs/heads/master Commit: 5f271e67c41c26552628b931c194fa2976fde3b1 Parents: 925b3a0 Author: daserge Authored: Wed Jan 18 19:27:26 2017 +0300 Committer: daserge Committed: Fri Jan 20 15:59:58 2017 +0300 ---------------------------------------------------------------------- plugin.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/5f271e67/plugin.xml ---------------------------------------------------------------------- diff --git a/plugin.xml b/plugin.xml index 5d96546..ceba4b1 100644 --- a/plugin.xml +++ b/plugin.xml @@ -235,7 +235,7 @@ xmlns:rim="http://www.blackberry.com/ns/widgets" - + @@ -252,7 +252,7 @@ xmlns:rim="http://www.blackberry.com/ns/widgets" - + --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org