Gina Häußge 5b976b5300 Merge branch 'devel' into CapnBry-sendperf ... Conflicts: octoprint/util/__init__.py		2013-06-29 18:38:23 +02:00
..
static	Added git information to website	2013-06-29 13:41:39 +02:00
templates	Added git information to website	2013-06-29 13:41:39 +02:00
util	Merge branch 'devel' into CapnBry-sendperf	2013-06-29 18:38:23 +02:00
__init__.py
daemon.py
events.py	More in-source documentation for events	2013-06-29 14:33:05 +02:00
gcodefiles.py	Added filament diameter retrieval from gcode generated by Cura, fixed Slic3r version	2013-06-18 21:28:05 +02:00
printer.py	Switch ringbuffer lists for deques. 6% performance boost (4.5% vs baseline)	2013-06-28 14:19:33 -04:00
server.py	Just in case something goes wrong during reading the git repo information...	2013-06-29 13:43:45 +02:00
settings.py	Merge branch 'master' into devel	2013-06-27 21:51:09 +02:00
timelapse.py	Merge branch 'peteruithoven-master' into devel	2013-06-23 14:58:58 +02:00
users.py	Upgraded to most recent Flask-Principal version, since an attribute name was changed there which OctoPrint uses	2013-04-14 15:33:11 +02:00