Merge branch 'master' of github.com:adafruit/Standalone-Arduino-AVR-ISP-programmer

ladyada · ladyada · commit d7cfaa5527b3 · 2012-02-13T11:33:20.000-05:00
diff --git a/optiLoader.h b/optiLoader.h
@@ -1,4 +1,8 @@
-#include <WProgram.h>
+#if ARDUINO >= 100
+ #include "Arduino.h"
+#else
+ #include "WProgram.h"
+#endif
 #include <avr/pgmspace.h>
 #include "SPI.h"
 
