Skip to content

Commit

Permalink
Merge pull request #4 from jaitaiwan/master
Browse files Browse the repository at this point in the history
Spine Update
  • Loading branch information
maccman committed Nov 20, 2011
2 parents f8a1d0c + 0ed9971 commit c08dd5f
Show file tree
Hide file tree
Showing 7 changed files with 196 additions and 90 deletions.
2 changes: 1 addition & 1 deletion index.html
Expand Up @@ -10,7 +10,7 @@
<script src="lib/jquery.tmpl.js" type="text/javascript" charset="utf-8"></script>

<script src="lib/spine.js" type="text/javascript" charset="utf-8"></script>
<script src="lib/spine.local.js" type="text/javascript" charset="utf-8"></script>
<script src="lib/local.js" type="text/javascript" charset="utf-8"></script>
<script src="lib/application.js" type="text/javascript" charset="utf-8"></script>

<script type="text/x-jquery-tmpl" id="taskTemplate">
Expand Down
55 changes: 41 additions & 14 deletions lib/application.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/spine.local.js → lib/local.js
@@ -1,6 +1,6 @@
(function() {
if (typeof Spine === "undefined" || Spine === null) {
Spine = require("spine");
Spine = require('spine');
}
Spine.Model.Local = {
extended: function() {
Expand Down

0 comments on commit c08dd5f

Please sign in to comment.