mmcwilliams d9a18b5d43 Merge remote-tracking branch 'origin/master' ... # Conflicts: # ino/mcopy_camera_tests/mcopy_camera_tests.ino Fixed gross conflict		2016-06-09 17:23:17 -04:00
..
css	CMYK controls almost fully functional	2016-05-18 18:05:43 -04:00
data	Timed exposure commands	2016-05-29 20:33:40 -04:00
fonts	Fixed font-awesome	2016-04-13 17:36:12 -04:00
js	Make mscript command line function	2016-06-09 17:21:49 -04:00
lib	Make mscript command line function	2016-06-09 17:21:49 -04:00
src	Make mscript command line function	2016-06-09 17:21:49 -04:00
tests	Add mscript tests	2016-04-12 00:21:31 -04:00
.gitignore	Create configfile on first startup	2016-04-15 18:16:14 -04:00
gulpfile.js	Add codemirror for editing mscript	2016-04-19 16:49:37 -04:00
index.html	Build out CMY controls for lighting	2016-05-16 10:41:24 -04:00
install.sh	Create log directory on install of app	2016-04-22 12:37:58 -04:00
main.js	Add notification handler to gui	2016-04-22 14:34:44 -04:00
package.json	Lighting GUI complete	2016-04-17 17:55:23 -04:00