Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

Conflicts:
	static/WebStore/index.html
  • Loading branch information...
2 parents e825977 + 9472bd0 commit 77db893c7b26de18b5e3bd97951b424a7897af14 @claudiocherubino committed May 23, 2011
Showing with 4 additions and 6 deletions.
  1. +4 −6 static/WebStore/index.html
  2. BIN static/WebStore/static/images/close.png
@@ -77,7 +77,6 @@
<h2 class="titleTitle">
Web Apps HTML5 e il Chrome Web Store
</h2>
-
<p class="titleText">
Claudio Cherubino (<a href="http://twitter.com/ccherubino">@ccherubino</a>)<br/>
@@ -303,7 +302,6 @@ <h2 class="titleTitle">
</section>
</div>
-
<div class="slide">
<header>Discovery</header>
<section class="hbox boxcenter">
@@ -498,6 +496,8 @@ <h2 class="titleTitle">
</section>
</div>
+
+
<div class="slide">
<header>Cosa rende le applicazioni Web speciali?</header>
<section class="hbox boxcenter">
@@ -620,7 +620,7 @@ <h2 class="titleTitle">
</ul>
</section>
<section class="hcenter">
- <a href="demos/upload_directory/index.html" target="_new">
+ <a href="http://html5-demos.appspot.com/static/html5storage/demos/upload_directory/index.html" target="_new">
<img src="static/images/folder.png" class="clickable"/>
</a>
</section>
@@ -808,14 +808,12 @@ <h2 class="titleTitle">
</section>
</div>
-
-
<div class="slide">
<header>Links</header>
<section class="hbox boxcenter">
<div class="noflex vbox boxcenter">
<p><a href="http://www.html5rocks.com/">html5rocks.com</a></p>
- <p><a href="http://code.google.com/chrome/apps/"> code.google.com/chrome/apps/- Apps developer guide</a></p>
+ <p><a href="http://code.google.com/chrome/apps/">code.google.com/chrome/apps/ - Apps developer guide</a></p>
<p><a href="http://code.google.com/chrome/webstore/docs/">code.google.com/chrome/webstore/docs/ - Web Store developer guide</a></p>
<p><a href="https://sites.google.com/site/bootcampcwslab/">sites.google.com/site/bootcampcwslab/ - Tutorial: Building a packaged app</a></p>
</div>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 77db893

Please sign in to comment.