Gina Häußge ea52bbfb14 Merge branch 'gcodeViewer' into devel ... Conflicts: octoprint/server.py octoprint/settings.py octoprint/static/js/ui.js		2013-02-03 21:38:00 +01:00
..
css	Revamped gcode analysis.	2013-02-03 21:14:22 +01:00
gcodeviewer	Remove duplicate css files	2013-02-03 12:52:27 +03:00
img	Renamed from Printer WebUI to OctoPrint	2013-01-18 23:44:11 +01:00
js	Merge branch 'gcodeViewer' into devel	2013-02-03 21:38:00 +01:00