Permalink
Browse files

Merged in changed from head.

  • Loading branch information...
1 parent d6605b2 commit 47b35d84b0c5e1e0beab5b98e86eb7fb3dab29af @wnielson committed Mar 27, 2012
Showing with 7 additions and 3 deletions.
  1. +1 −1 app.js
  2. +1 −1 app.json
  3. +1 −1 cache.manifest
  4. +4 −0 index.html
View
2 app.js
1 addition, 1 deletion not shown because the diff is too large. Please use a local Git client to view these changes.
View
2 app.json
@@ -1 +1 @@
-{"id":"152440a0-7772-11e1-aa1c-bf802d67caea","js":[{"path":"sdk/sencha-touch.js","type":"js","version":"aaf5401ca948a2ac0f3faa30388c1273531a0c6f"},{"path":"app.js","update":"delta","type":"js","version":"7cb277b7aa359d7497f62b3687cc415aec8a4da0"}],"css":[{"path":"resources/css/app.css","update":"delta","type":"css","version":"4c8315f8f4083d0b72a82994570ae6ed9f7fdbf7"}]}
+{"id":"152440a0-7772-11e1-aa1c-bf802d67caea","js":[{"path":"sdk/sencha-touch.js","type":"js","version":"aaf5401ca948a2ac0f3faa30388c1273531a0c6f"},{"path":"app.js","update":"delta","type":"js","version":"f574c753895f22a38074614ce53e19a3da886d36"}],"css":[{"path":"resources/css/app.css","update":"delta","type":"css","version":"4c8315f8f4083d0b72a82994570ae6ed9f7fdbf7"}]}
View
2 cache.manifest
@@ -1,5 +1,5 @@
CACHE MANIFEST
-# 201f5d449cdd915dabfa9c77fac390d7ec67cc5f
+# 87bb336411da34a595de6c14a2cbaba6607ba091
index.html
# 43d0ac604bbbab34ffbaeacd401328cb9e8861fd
resources/images/guide.jpg
View
4 index.html
@@ -3,6 +3,10 @@
<head>
<meta charset="UTF-8">
<title>SlideNavigationExample</title>
+
+ <!-- Android debug -->
+ <!--<script src="http://10.0.2.2:8080/target/target-script-min.js#anonymous"></script>-->
+
<style type="text/css">
/**
* Example CSS for adding a drop shadow to the main container.

0 comments on commit 47b35d8

Please sign in to comment.