104 Commits

Author	SHA1	Message	Date
Erik van der Zalm	c6f2ec3c82	remove stop_heating_wait	2012-02-27 18:45:45 +01:00
Erik van der Zalm	11518a987f	merged with triffid fork	2012-02-12 13:58:36 +01:00
Michael Moon	5aadc2f5ca	cardreader needs to include some other files	2012-01-24 13:19:24 +11:00
Michael Moon	8d0916af13	allow Marlin to actually compile with Makefile pulled from Sprinter and a few other modifications	2012-01-24 13:18:54 +11:00