Florian Mounier 985d8b86e6 Merge branch 'master' into domscroll_try2 ...

Conflicts:
	butterfly/static/main.css
	butterfly/static/main.js
	coffees/term.coffee
	sass/_16_colors.sass

2014-05-19 12:57:56 +02:00

..

main.coffee

Fix wrong early char size computation

2014-05-19 11:47:41 +02:00

selection.coffee

To grunt and libsass

2014-04-30 15:48:16 +02:00

term.coffee

Merge branch 'master' into domscroll_try2

2014-05-19 12:57:56 +02:00

virtual_input.coffee

To grunt and libsass

2014-04-30 15:48:16 +02:00