Merge pull request #67 from simonepri/master

Update 4.2.0

Merge pull request #67 from simonepri/master
Update 4.2.0
309b3191 · Simone Primarosa · ef15427e · 79672c8b · 309b3191 · ef15427e
Commit 309b3191 authored Aug 24, 2015 by Simone Primarosa
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 641 additions and 1333 deletions

conditionals.h MarlinKimbra/conditionals.h +641 -626

conditionals.h.new MarlinKimbra/conditionals.h.new +0 -707

No files found.
--- a/MarlinKimbra/conditionals.h
+++ b/MarlinKimbra/conditionals.h
--- a/MarlinKimbra/conditionals.h.new
+++ b/MarlinKimbra/conditionals.h.new