Commit Graph

4 Commits

Author SHA1 Message Date
Jeff Nusz
e129e08b9d Merge branch 'dionysiusmarquis-dionysius-brach' into develop
# Conflicts:
#	src/dat/controllers/NumberControllerBox.js
#	src/dat/controllers/NumberControllerSlider.js
#	src/dat/controllers/factory.js
#	src/dat/gui/style.css
2016-08-17 16:16:15 -07:00
Tomas Korcak
e6df810a7b Fix eslint issues 2015-08-15 00:16:18 +02:00
Tomas Korcak
075e499065 Using classses 2015-08-14 18:27:54 +02:00
Tomas Korcak
78e84d8c3b Using import (es6) 2015-08-14 17:28:30 +02:00