incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From macdo...@apache.org
Subject [1/3] android commit: Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/incubator-cordova-android
Date Wed, 24 Oct 2012 20:32:17 GMT
Updated Branches:
  refs/heads/master 8512ebb92 -> 58f58d9ee


Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/incubator-cordova-android

Conflicts:
	framework/assets/js/cordova.android.js


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

Branch: refs/heads/master
Commit: 58f58d9ee8a7cb8b78ff036ebf8f3e1cf1a11505
Parents: 412bb34 8512ebb
Author: Simon MacDonald <simon.macdonald@gmail.com>
Authored: Wed Oct 24 16:32:01 2012 -0400
Committer: Simon MacDonald <simon.macdonald@gmail.com>
Committed: Wed Oct 24 16:32:01 2012 -0400

----------------------------------------------------------------------
 VERSION                                      |    2 +-
 bin/templates/project/assets/www/index.html  |    2 +-
 framework/assets/www/index.html              |    2 +-
 framework/src/org/apache/cordova/Device.java |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------



Mime
View raw message