You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2013/04/17 22:37:58 UTC

[2/4] android commit: Merge branch 'master' of github.com:SunshineTech/cordova-android into sunshine

Merge branch 'master' of github.com:SunshineTech/cordova-android into sunshine


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

Branch: refs/heads/master
Commit: ac61ebf2d50fe5fe5dab900a2659b8145d24b580
Parents: cb99ed0 2bf6509
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Apr 17 11:44:49 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Apr 17 11:44:49 2013 -0700

----------------------------------------------------------------------
 .../apache/cordova/CordovaLocationListener.java    |   62 ++++++++++++--
 framework/src/org/apache/cordova/GeoBroker.java    |   18 +++--
 2 files changed, 63 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ac61ebf2/framework/src/org/apache/cordova/GeoBroker.java
----------------------------------------------------------------------
diff --cc framework/src/org/apache/cordova/GeoBroker.java
index e7cdce0,081c83d..4a07b73
mode 100755,100644..100644
--- a/framework/src/org/apache/cordova/GeoBroker.java
+++ b/framework/src/org/apache/cordova/GeoBroker.java