initial commit of mixing.enchant.js
initial commit of mixing.enchant.js
Merge branch 'feature/mixing.enchant.js' of https://github.com/wise9/enchant.js into feature/mixing.enchant.js
grunt
minor change & documentation
first commmit for wiiu.enchant.js
add example for wiiu
cache stick value
add wiiu examples
bugfix
grunt
add description about trademark
fix #150
fix #149
fix #149

Conflicts:

	enchant.min.js
fix #150

Conflicts:

	tests/qunit/enchant.js/label-textalign.js
skip tests about webgl on phantomjs
Merge branch 'develop'

Conflicts:
	enchant.min.js
	tests/qunit/enchant.js/label-textalign.js
	tests/qunit/gl.enchant.js/gl.js
reuse old surface in mutabletext if its still ok
fix