cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject [3/3] git commit: Merge branch 'next'
Date Wed, 27 Feb 2013 21:55:37 GMT
Updated Branches:
  refs/heads/master 7a1934d52 -> c1c66386e


Merge branch 'next'


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

Branch: refs/heads/master
Commit: c1c66386ec81762a41d94d8d4d4dde22eafe2db3
Parents: 7a1934d 0aef8e9
Author: Fil Maj <maj.fil@gmail.com>
Authored: Wed Feb 27 13:55:10 2013 -0800
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Wed Feb 27 13:55:10 2013 -0800

----------------------------------------------------------------------
 README.md                                          |    6 +-
 VERSION                                            |    2 +-
 lib/cordova-android/VERSION                        |    2 +-
 .../bin/templates/cordova/appinfo.jar              |  Bin 1574 -> 1574 bytes
 .../bin/templates/project/assets/www/index.html    |    2 +-
 .../framework/assets/js/cordova.android.js         |   26 +-
 .../framework/assets/www/index.html                |    2 +-
 .../framework/src/org/apache/cordova/Device.java   |    2 +-
 lib/cordova-blackberry/VERSION                     |    2 +-
 .../bin/templates/project/www/VERSION              |    2 +-
 .../bin/templates/project/www/index.html           |    2 +-
 .../ext/src/org/apache/cordova/device/Device.java  |    2 +-
 .../javascript/cordova.blackberry.js               |  345 ++++++++++++---
 lib/cordova-ios/CordovaLib/Classes/CDVCamera.h     |    1 +
 lib/cordova-ios/CordovaLib/Classes/CDVCamera.m     |   62 ++-
 lib/cordova-ios/CordovaLib/VERSION                 |    2 +-
 lib/cordova-ios/CordovaLib/cordova.ios.js          |   30 ++-
 lib/cordova-ios/RELEASENOTES.md                    |   56 +++-
 .../guides/Cordova Plugin Upgrade Guide.md         |   58 +++-
 package.json                                       |    2 +-
 20 files changed, 497 insertions(+), 109 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/c1c66386/README.md
----------------------------------------------------------------------


Mime
View raw message