| 
							
							
								 Michael Moon | a991bde523 | enable auto-reset before programming, disable afterwards | 2012-01-24 14:25:28 +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 |  | 
			
				
					| 
							
							
								 Bernhard | 11f2dafc4e | one step closer to a functional makefile.. | 2011-12-22 16:43:28 +01:00 |  | 
			
				
					| 
							
							
								 Bernhard | 57f9359a41 | simplified the includes, makefile now works with arduino23 | 2011-12-22 14:55:45 +01:00 |  | 
			
				
					| 
							
							
								 Bernhard Kubicek | 900e0c9bf2 | overworked the serial responses. Quite difficult, since many texts are Pronterface protocol. | 2011-11-06 17:33:09 +01:00 |  | 
			
				
					| 
							
							
								 Bernhard Kubicek | 00674af3a8 | merge from the branch bkubicek/Marlin/zalmmerge | 2011-11-05 14:13:20 +01:00 |  | 
			
				
					| 
							
							
								 Erik van der Zalm | 094afe7c10 | Merged Marlin, Marlin non gen6 and Ultimaker changes | 2011-11-04 18:02:56 +01:00 |  | 
			
				
					| 
							
							
								 Erik van der Zalm | 750f6c33e3 | first commit | 2011-08-12 22:28:35 +02:00 |  |