chiark - git - ianmdlvl - marlin.git/commit

chiark / gitweb /

~ianmdlvl / marlin.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 0b1423c) | patch

author	Erik van der Zalm <erik@vdzalm.eu>
	Fri, 4 Nov 2011 17:02:56 +0000 (18:02 +0100)
committer	Erik van der Zalm <erik@vdzalm.eu>
	Fri, 4 Nov 2011 17:02:56 +0000 (18:02 +0100)
commit	094afe7c1065d5663628b389f27687a5f465abb8
tree	78f8e0f39168a799d524c39793bac6ca86668fd0	tree \| snapshot
parent	0b1423c303c6d7eef7d9f8f04666dd1a1a529bb7	commit \| diff

Merged Marlin, Marlin non gen6 and Ultimaker changes

22 files changed:

Marlin/Configuration.h		diff \| blob \| history
Marlin/EEPROM.h	[new file with mode: 0644]	blob
Marlin/Makefile		diff \| blob \| history
Marlin/Marlin.h		diff \| blob \| history
Marlin/Marlin.pde		diff \| blob \| history
Marlin/fastio.h		diff \| blob \| history
Marlin/lcd.h	[new file with mode: 0644]	blob
Marlin/lcd.pde	[new file with mode: 0644]	blob
Marlin/pins.h		diff \| blob \| history
Marlin/planner.cpp	[new file with mode: 0644]	blob
Marlin/planner.h	[new file with mode: 0644]	blob
Marlin/speed_lookuptable.h		diff \| blob \| history
Marlin/stepper.cpp	[new file with mode: 0644]	blob
Marlin/stepper.h	[new file with mode: 0644]	blob
Marlin/streaming.h	[new file with mode: 0644]	blob
Marlin/temperature.cpp	[new file with mode: 0644]	blob
Marlin/temperature.h	[new file with mode: 0644]	blob
Marlin/thermistortables.h		diff \| blob \| history
Marlin/ultralcd.h	[new file with mode: 0644]	blob
Marlin/ultralcd.pde	[new file with mode: 0644]	blob
Marlin/wiring.c	[deleted file]	blob \| history
Marlin/wiring_serial.c	[deleted file]	blob \| history

Unnamed repository; edit this file 'description' to name the repository.