lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-09-19 02:37:59 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/binoculars/KineticJS into binoculars-master

Browse Source 
Conflicts:
	Gruntfile.js
	test/runner.html
This commit is contained in:
ippo615
2013-11-30 13:17:51 -05:00
parent 00861095f4 14570f7bed
commit 4d16ccfe70
4 changed files with 82 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/runner.html
View File

@@ -43,7 +43,7 @@
<script src="unit/Global-test.js"></script>
<script src="unit/Util-test.js"></script>
<script src="unit/Canvas-test.js"></script>
<script src="unit/Node-test.js"></script>
<script src="unit/Node-test.js"></script>
<script src="unit/Container-test.js"></script>
<script src="unit/Stage-test.js"></script>
<script src="unit/Layer-test.js"></script>
@@ -90,6 +90,7 @@
<script src="unit/filters/Levels-test.js"></script>
<script src="unit/filters/Flip-test.js"></script>
<script src="unit/filters/Mirror-test.js"></script>
<script src="unit/filters/Sepia-test.js"></script>
<!--=============== functional tests ================-->
@@ -106,4 +107,4 @@
else { mocha.run(); }
</script>
</body>
</html>
</html>