Gina Häußge 8be1329a71 Merge branch 'devel' into gcodestreaming ... Conflicts: octoprint/printer.py octoprint/static/js/ui.js octoprint/templates/index.jinja2 octoprint/util/comm.py		2013-06-09 18:28:40 +02:00
..
css	Changed to GCODE streaming instead of loading it all into memory -- no more loading times. Also better file handling.	2013-05-31 22:41:53 +02:00
font	Forgot to commit Font Awesome	2013-03-30 18:29:13 +01:00
gcodeviewer	Made gcode viewer capable of handling progress information	2013-06-09 14:00:15 +02:00
img	Added missing image resource	2013-06-03 22:25:23 +02:00
js	Merge branch 'devel' into gcodestreaming	2013-06-09 18:28:40 +02:00