Skip to content

Commit

Permalink
Merge pull request doublespeakgames#63 from Vermilingua/fallbackjquery
Browse files Browse the repository at this point in the history
Cleaned up the scars from the merge, and added the working fallback
  • Loading branch information
Continuities committed Nov 3, 2013
2 parents ebee3be + d78fd6a commit 9ae4ea5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
8 changes: 6 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,15 @@
<link rel="shortcut icon" href="favicon.ico" />
<link rel="image_src" href="img/adr.png" />
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
<!-- <script src="lib/jquery.min.js"></script> -->
<script>
if(!window.jQuery) {
document.write('<script src="lib/jquery.min.js"><\/script>')
}
</script>
<script src="lib/jquery.color-2.1.2.min.js"></script>
<script src="lib/jquery.event.move.js"></script>
<script src="lib/jquery.event.swipe.js"></script>
<script src="lib/base64.js"></script>
<script src="lib/base64.js"></script>
<script src="script/Button.js"></script>
<script src="script/engine.js"></script>
<script src="script/state_manager.js"></script>
Expand Down
5 changes: 0 additions & 5 deletions list.TODO

This file was deleted.

0 comments on commit 9ae4ea5

Please sign in to comment.