Merge branch 'master' of git://github.com/phonegap/phonegap-android

This commit is contained in:
macdonst 2011-06-30 15:43:50 -04:00
commit 7cc1cc4a3f
4 changed files with 7 additions and 7 deletions

View File

@ -1 +1 @@
0.9.6
0.9.6.1

View File

@ -5,8 +5,8 @@
<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" charset="utf-8">
<script type="text/javascript" charset="utf-8" src="phonegap.0.9.6.min.js"></script>
<script type="text/javascript" charset="utf-8" src="main.js"></script>
<script type="text/javascript" charset="utf-8" src="phonegap.0.9.6.1.min.js"></script>
<script type="text/javascript" charset="utf-8" src="main.js"></script>
</head>
<body onload="init();" id="stage" class="theme">
@ -31,8 +31,8 @@
<a href="#" class="btn large" onclick="show_pic();">Get a Picture</a>
<a href="#" class="btn large" onclick="get_contacts();">Get Phone's Contacts</a>
<a href="#" class="btn large" onclick="check_network();">Check Network</a>
<div id="viewport" class="viewport" style="display: none;">
<div id="viewport" class="viewport" style="display: none;">
<img style="width:60px;height:60px" id="test_img" src="" />
</div>
</div>
</body>
</html>

View File

@ -1,7 +1,7 @@
<html>
<head>
<title></title>
<script src="phonegap.0.9.6.min.js"></script>
<script src="phonegap.0.9.6.1.min.js"></script>
</head>
<body>

View File

@ -18,7 +18,7 @@ import android.provider.Settings;
public class Device extends Plugin {
public static String phonegapVersion = "0.9.6"; // PhoneGap version
public static String phonegapVersion = "0.9.6.1"; // PhoneGap version
public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID