Merge remote-tracking branch 'Ganonmaster/master'

This commit is contained in:
Puzzlet Chung 2012-12-29 15:47:28 +09:00
commit d113b9d950
6 changed files with 99 additions and 53 deletions

View file

@ -6,7 +6,11 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"></script>
<script src="../lib/ComicBook.min.js"></script>
<script src="../lib/ComicBook.js"></script>
<script src="../lib/pixastic/pixastic.core.js"></script>
<script src="../lib/pixastic/actions/brightness.js"></script>
<script src="../lib/pixastic/actions/desaturate.js"></script>
<script src="../lib/pixastic/actions/brightness.js"></script>
<link rel="stylesheet" href="../css/reset.css">
<link rel="stylesheet" href="../css/Aristo/css/Aristo/Aristo.css">