incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [1/9] wp7 commit: merging
Date Fri, 27 Apr 2012 00:32:14 GMT
Updated Branches:
  refs/heads/master df46ac907 -> afe668278


merging


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

Branch: refs/heads/master
Commit: afe668278772d883d7b7074d08460995de02f745
Parents: 9e2c49d df46ac9
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Thu Apr 26 17:27:52 2012 -0700
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Thu Apr 26 17:27:52 2012 -0700

----------------------------------------------------------------------
 README.md                                   |   23 +-
 VERSION                                     |    2 +-
 cordova-1.6.1.js                            | 4981 ----------------------
 cordova-1.7.0.js                            | 4774 ---------------------
 cordova-1.7.0rc1.js                         | 4778 +++++++++++++++++++++
 example/www/cordova-1.5.0.js                | 3832 -----------------
 example/www/cordova-1.7.0rc1.js             | 4778 +++++++++++++++++++++
 example/www/cordova.js                      |    2 +-
 framework/Cordova/CommandFactory.cs         |    8 +-
 framework/Cordova/Commands/Capture.cs       |   20 +-
 framework/Cordova/Commands/Contacts.cs      |    2 +-
 framework/Cordova/Commands/NetworkStatus.cs |  102 +-
 templates/custom/www/cordova-1.5.0-core.js  | 2594 -----------
 templates/custom/www/cordova-1.5.0.js       | 3832 -----------------
 templates/custom/www/cordova-1.7.0rc1.js    | 4778 +++++++++++++++++++++
 templates/custom/www/index.html             |    9 +-
 templates/full/www/cordova-1.7.0rc1.js      | 4778 +++++++++++++++++++++
 templates/full/www/index.html               |   19 +-
 18 files changed, 19228 insertions(+), 20084 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/afe66827/VERSION
----------------------------------------------------------------------
diff --cc VERSION
index 9dbb0c0,d88d8e7..bd8bf88
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 1.7.0
 -1.7.0rc1
++1.7.0

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/afe66827/templates/full/www/index.html
----------------------------------------------------------------------
diff --cc templates/full/www/index.html
index d29bb1c,a8974fa..be6b1e5
--- a/templates/full/www/index.html
+++ b/templates/full/www/index.html
@@@ -3,13 -3,13 +3,14 @@@
    <head>
      <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0,
maximum-scale=1.0, user-scalable=no;" />
      <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
--    
++
      <title>Cordova WP7</title>
--    
++
  	  <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no
title" charset="utf-8"/>
--            
-       <script type="text/javascript" charset="utf-8" src="cordova-1.7.0.js"></script>
-        
++
++
+       <script type="text/javascript" charset="utf-8" src="cordova-1.7.0rc1.js"></script>
 -       
++
        <script type="text/javascript">
  
          document.addEventListener("deviceready",onDeviceReady,false);
@@@ -19,13 -19,13 +20,13 @@@
          {
              document.getElementById("welcomeMsg").innerHTML += "Cordova is ready! version="
+ window.device.cordova;
              console.log("onDeviceReady. You should see this message in Visual Studio's output
window.");
--            
++
          }
  
        </script>
--      
--	 
--	  
++
++
++
  
    </head>
    <body>


Mime
View raw message