Merge lp://qastaging/~dbarth/cordova-ubuntu/container-update-to-3.4.0-plus-fixes into lp://qastaging/cordova-ubuntu/container
Proposed by
David Barth
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~dbarth/cordova-ubuntu/container-update-to-3.4.0-plus-fixes |
| Merge into: | lp://qastaging/cordova-ubuntu/container |
| Diff against target: |
1370 lines (+491/-201) 40 files modified
apparmor.json (+1/-1) build/VERSION (+1/-1) build/bin/node_modules/colors/package.json (+2/-8) build/bin/node_modules/elementtree/CHANGES.md (+9/-4) build/bin/node_modules/elementtree/README.md (+114/-0) build/bin/node_modules/elementtree/lib/elementtree.js (+15/-2) build/bin/node_modules/elementtree/node_modules/sax/package.json (+1/-8) build/bin/node_modules/elementtree/package.json (+4/-7) build/bin/node_modules/elementtree/tests/test-simple.js (+40/-0) build/bin/node_modules/optimist/node_modules/minimist/index.js (+8/-14) build/bin/node_modules/optimist/node_modules/minimist/package.json (+2/-5) build/bin/node_modules/optimist/node_modules/minimist/test/parse.js (+21/-0) build/bin/node_modules/optimist/node_modules/minimist/test/short.js (+0/-18) build/bin/node_modules/optimist/node_modules/wordwrap/package.json (+0/-3) build/bin/node_modules/optimist/package.json (+1/-8) build/bin/node_modules/shelljs/package.json (+1/-8) build/src/coreplugins.cpp (+12/-10) build/src/plugins/org.apache.cordova.camera/camera.cpp (+3/-3) build/src/plugins/org.apache.cordova.camera/camera.h (+10/-0) build/src/plugins/org.apache.cordova.device-motion/accelerometer.cpp (+1/-1) build/src/plugins/org.apache.cordova.file-transfer/file-transfer.cpp (+7/-7) build/www/cordova.js (+2/-2) config.xml (+3/-3) cordova/node_modules/colors/package.json (+2/-8) cordova/node_modules/elementtree/CHANGES.md (+9/-4) cordova/node_modules/elementtree/README.md (+114/-0) cordova/node_modules/elementtree/lib/elementtree.js (+15/-2) cordova/node_modules/elementtree/node_modules/sax/package.json (+1/-8) cordova/node_modules/elementtree/package.json (+4/-7) cordova/node_modules/elementtree/tests/test-simple.js (+40/-0) cordova/node_modules/optimist/node_modules/minimist/index.js (+8/-14) cordova/node_modules/optimist/node_modules/minimist/package.json (+2/-5) cordova/node_modules/optimist/node_modules/minimist/test/parse.js (+21/-0) cordova/node_modules/optimist/node_modules/minimist/test/short.js (+0/-18) cordova/node_modules/optimist/node_modules/wordwrap/package.json (+0/-3) cordova/node_modules/optimist/package.json (+1/-8) cordova/node_modules/shelljs/package.json (+1/-8) debian/changelog (+12/-0) platform_www/cordova.js (+2/-2) qml/CaptureWidget.qml (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~dbarth/cordova-ubuntu/container-update-to-3.4.0-plus-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Cordova Ubuntu Team | Pending | ||
|
Review via email:
|
|||
Commit message
3.4.0 + maxim's fixes
Description of the change
3.4.0 + maxim's fixes
To post a comment you must log in.
Unmerged revisions
- 23. By David Barth
-
3.4.0 with ubuntu fixes
- 22. By David Barth
-
add Maxim's latest fixes for camera, file-transfer and device-motion plugins
- 21. By David Barth
-
Update to 3.4.0 release
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
