cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject [2/2] spec commit: Making it work for us.
Date Thu, 14 Aug 2014 18:51:55 GMT
Making it work for us.


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/cfcc3975
Tree: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/tree/cfcc3975
Diff: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/diff/cfcc3975

Branch: refs/heads/master
Commit: cfcc39753e8f72ab284e10ee024daddd27dfc1cc
Parents: ed185ae
Author: Archana Naik <naika@lab126.com>
Authored: Thu Oct 31 12:04:14 2013 -0700
Committer: Archana Naik <naika@lab126.com>
Committed: Thu Aug 14 11:50:16 2014 -0700

----------------------------------------------------------------------
 config.xml                                    | 1 +
 cordova-plugin-whitelist/test/cordova-incl.js | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/blob/cfcc3975/config.xml
----------------------------------------------------------------------
diff --git a/config.xml b/config.xml
index b64fc17..6252ef2 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <widget id="org.apache.mobilespec" version="0.0.1" xmlns="http://www.w3.org/ns/widgets"
xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<<<<<<< HEAD
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file

http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/blob/cfcc3975/cordova-plugin-whitelist/test/cordova-incl.js
----------------------------------------------------------------------
diff --git a/cordova-plugin-whitelist/test/cordova-incl.js b/cordova-plugin-whitelist/test/cordova-incl.js
index a82c590..ae7c156 100644
--- a/cordova-plugin-whitelist/test/cordova-incl.js
+++ b/cordova-plugin-whitelist/test/cordova-incl.js
@@ -22,6 +22,7 @@
 var PLAT;
 (function getPlatform() {
     var platforms = {
+        amazon_fireos: /cordova-amazon-fireos/,
         android: /Android/,
         ios: /(iPad)|(iPhone)|(iPod)/,
         blackberry10: /(BB10)/,


Mime
View raw message