incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From macdo...@apache.org
Subject android commit: Tagging 1.5.0
Date Fri, 02 Mar 2012 02:29:42 GMT
Updated Branches:
  refs/heads/master 4a23f8641 -> aa4f2cc4d


Tagging 1.5.0


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/aa4f2cc4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/aa4f2cc4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/aa4f2cc4

Branch: refs/heads/master
Commit: aa4f2cc4d9ac054aa5fe086c14d49138b3d67700
Parents: 4a23f86
Author: macdonst <simon.macdonald@gmail.com>
Authored: Thu Mar 1 21:29:18 2012 -0500
Committer: macdonst <simon.macdonald@gmail.com>
Committed: Thu Mar 1 21:29:18 2012 -0500

----------------------------------------------------------------------
 VERSION                                            |    2 +-
 .../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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aa4f2cc4/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 6994d9e..bc80560 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.0rc1
+1.5.0

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aa4f2cc4/bin/templates/project/cordova/templates/project/assets/www/index.html
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/templates/project/assets/www/index.html b/bin/templates/project/cordova/templates/project/assets/www/index.html
index ec9a77f..00704ae 100644
--- a/bin/templates/project/cordova/templates/project/assets/www/index.html
+++ b/bin/templates/project/cordova/templates/project/assets/www/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
     <title>PhoneGap</title>
 	  <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title">
-	  <script type="text/javascript" charset="utf-8" src="cordova-1.4.1.js"></script>
+	  <script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></script>
 	  <script type="text/javascript" charset="utf-8" src="main.js"></script>
 
   </head>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aa4f2cc4/framework/assets/www/index.html
----------------------------------------------------------------------
diff --git a/framework/assets/www/index.html b/framework/assets/www/index.html
index 4ce0a06..f65e929 100644
--- a/framework/assets/www/index.html
+++ b/framework/assets/www/index.html
@@ -19,7 +19,7 @@
 <html>
   <head>
     <title></title>
-    <script src="cordova-1.5.0rc1.js"></script>
+    <script src="cordova-1.5.0.js"></script>
   </head>
   <body>
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/aa4f2cc4/framework/src/org/apache/cordova/Device.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/Device.java b/framework/src/org/apache/cordova/Device.java
index a12eb33..9b3057c 100644
--- a/framework/src/org/apache/cordova/Device.java
+++ b/framework/src/org/apache/cordova/Device.java
@@ -38,7 +38,7 @@ import android.telephony.TelephonyManager;
 public class Device extends Plugin {
     public static final String TAG = "Device";
 
-    public static String cordovaVersion = "1.5.0rc1";              // Cordova version
+    public static String cordovaVersion = "1.5.0";              // Cordova version
 	public static String platform = "Android";					// Device OS
 	public static String uuid;									// Device UUID
     


Mime
View raw message