kiyoshigawa 6a81291c57 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
This should fix issues with pull request 467, I hope.

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
	Marlin/ultralcd_implementation_hitachi_HD44780.h
2013-06-08 08:48:18 -06:00
..
2011-08-12 22:28:35 +02:00
2012-08-29 22:53:41 +01:00
2012-11-12 15:35:28 +01:00
2012-08-22 14:49:57 +02:00
2012-08-22 14:49:57 +02:00
2012-08-22 14:49:57 +02:00
2013-06-06 09:18:03 -07:00
2013-05-26 17:57:49 +02:00
2013-05-20 14:52:35 +02:00