You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2012/04/18 23:49:52 UTC
[21/37] spec commit: converted camera tests
converted camera tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/commit/1a0de186
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/1a0de186
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/1a0de186
Branch: refs/heads/master
Commit: 1a0de1861bdc88f9724dc0a800b464321da8897b
Parents: 70be8ec
Author: Gord Tanner <gt...@gmail.com>
Authored: Mon Apr 2 22:56:00 2012 -0400
Committer: Fil Maj <ma...@gmail.com>
Committed: Mon Apr 16 16:06:37 2012 -0700
----------------------------------------------------------------------
autotest/pages/camera.html | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/1a0de186/autotest/pages/camera.html
----------------------------------------------------------------------
diff --git a/autotest/pages/camera.html b/autotest/pages/camera.html
index 52b2a87..5b80261 100644
--- a/autotest/pages/camera.html
+++ b/autotest/pages/camera.html
@@ -2,6 +2,7 @@
<html>
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
@@ -53,6 +54,10 @@
=======
=======
>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
+=======
+=======
+>>>>>>> converted camera tests
+>>>>>>> converted camera tests
<head>
<title>Cordova: Camera API Specs</title>
@@ -97,9 +102,12 @@
<a href="javascript:" class="backBtn" onclick="backHome();">Back</a>
</body>
<<<<<<< HEAD
+<<<<<<< HEAD
>>>>>>> converted camera tests
=======
=======
+>>>>>>> converted camera tests
+=======
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
@@ -149,7 +157,12 @@
</div>
</body>
>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
+<<<<<<< HEAD
>>>>>>> fixed html errors, and various html tweaks, doctype, javascript:
+=======
+=======
+>>>>>>> converted camera tests
+>>>>>>> converted camera tests
</html>