merged from master

This commit is contained in:
Julian Descottes
2012-08-30 01:30:26 +02:00
11 changed files with 9996 additions and 2 deletions

View File

@@ -40,6 +40,9 @@
</div>
</div>
<div id="cursorInfo"></div>
<script src="js/lib/jquery-1.8.0.js"></script>
<script src="js/lib/pubsub.js"></script>
<script src="js/lib/jsColor_1_4_0/jscolor.js"></script>
<script src="js/frameSheetModel.js"></script>
<script src="js/piskel.js"></script>