Return-Path: 
 <commits-return-22434-apmail-cordova-commits-archive=cordova.apache.org@cordova.apache.org>
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 3508A10AF2
	for <apmail-cordova-commits-archive@www.apache.org>;
 Mon, 10 Feb 2014 23:26:51 +0000 (UTC)
Received: (qmail 80992 invoked by uid 500); 10 Feb 2014 23:24:09 -0000
Delivered-To: apmail-cordova-commits-archive@cordova.apache.org
Received: (qmail 79306 invoked by uid 500); 10 Feb 2014 23:23:22 -0000
Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cordova.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cordova.apache.org>
List-Post: <mailto:commits@cordova.apache.org>
List-Id: <commits.cordova.apache.org>
Reply-To: dev@cordova.apache.org
Delivered-To: mailing list commits@cordova.apache.org
Received: (qmail 78909 invoked by uid 99); 10 Feb 2014 23:23:08 -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, 10 Feb 2014 23:23:08 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 72559922ECB; Mon, 10 Feb 2014 23:23:07 +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: Mon, 10 Feb 2014 23:23:17 -0000
Message-Id: <8091d825ee8b475c936b5b61b192c393@git.apache.org>
In-Reply-To: <1cef25ed97e04f6cb1b4a6ca6422071e@git.apache.org>
References: <1cef25ed97e04f6cb1b4a6ca6422071e@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [11/15] git commit: WTF? ubuntu got automerged twice

WTF? ubuntu got automerged twice


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/736c8dde
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/736c8dde
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/736c8dde

Branch: refs/heads/master
Commit: 736c8ddec07314e5ff2fdafd7544e4b362c57af0
Parents: 9206d82
Author: Joe Bowser <bowserj@apache.org>
Authored: Thu Jan 16 11:34:47 2014 -0800
Committer: Joe Bowser <bowserj@apache.org>
Committed: Thu Jan 16 11:34:47 2014 -0800

----------------------------------------------------------------------
 plugin.xml | 9 ---------
 1 file changed, 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/736c8dde/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 433bf2f..9736604 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -68,15 +68,6 @@
         <resource-file src="src/ubuntu/close.png" />
     </platform>
 
-
-    <!-- ubuntu -->
-    <platform name="ubuntu">
-        <header-file src="src/ubuntu/inappbrowser.h" />
-        <source-file src="src/ubuntu/inappbrowser.cpp" />
-        <resource-file src="src/ubuntu/InAppBrowser.qml" />
-        <resource-file src="src/ubuntu/close.png" />
-    </platform>
-
     <!-- ios -->
     <platform name="ios">    
         <config-file target="config.xml" parent="/*">