cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmo...@apache.org
Subject [16/47] git commit: Merge branch 'CB-5113' of https://github.com/Touchit/cordova-plugin-geolocation into dev
Date Mon, 05 May 2014 16:13:13 GMT
Merge branch 'CB-5113' of https://github.com/Touchit/cordova-plugin-geolocation into dev


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

Branch: refs/heads/cdvtest
Commit: e05dae68c8710616678bb2a21a561cb9db20bbfe
Parents: eccd62b 22055cc
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Tue Dec 3 15:06:01 2013 -0800
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Tue Dec 3 15:06:01 2013 -0800

----------------------------------------------------------------------
 plugin.xml                       |   3 +
 src/windows8/GeolocationProxy.js | 163 ++++++++++++++++++++++++++++++++++
 2 files changed, 166 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/blob/e05dae68/plugin.xml
----------------------------------------------------------------------
diff --cc plugin.xml
index b34fdba,5563272..5486c4c
--- a/plugin.xml
+++ b/plugin.xml
@@@ -173,8 -129,11 +173,11 @@@ xmlns:android="http://schemas.android.c
          <config-file target="package.appxmanifest" parent="/Package/Capabilities">
              <DeviceCapability Name="location" />
          </config-file>
+         <js-module src="src/windows8/GeolocationProxy.js" name="GeolocationProxy">
+           <merges target="" />
+         </js-module>
      </platform>
 -    
 +
      <!-- firefoxos -->
      <platform name="firefoxos">
          <config-file target="config.xml" parent="/*">


Mime
View raw message