Cristian Maglie
3394f61276
Merged 1.0.5
2013-05-29 18:30:36 +02:00
Cristian Maglie
66ee23b885
Merged 1.0.3
2012-12-10 15:55:05 +01:00
Cristian Maglie
23c7536dc7
Merged 1.0.2
...
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Conflicts:
app/src/processing/app/debug/AvrdudeUploader.java
build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
build/shared/examples/09.USB/Keyboard/KeyboardSerial/KeyboardSerial.ino
build/shared/examples/09.USB/Mouse/ButtonMouseControl/ButtonMouseControl.ino
build/shared/examples/09.USB/Mouse/JoystickMouseControl/JoystickMouseControl.ino
hardware/arduino/boards.txt
2012-11-04 22:49:14 +01:00
Cristian Maglie
aba27c43aa
Merged upstream arduino branch
2012-10-18 15:50:09 +02:00
Cristian Maglie
33083d84b3
Merge of arduino-1.0.1. Work in progress...
2012-05-23 09:22:52 +02:00
Cristian Maglie
b276a75d13
Pre-merge upstream Arduino
2012-05-22 11:23:47 +02:00
Cristian Maglie
1b3ae5fa63
Created second level in hardware folder: hardware/PACKAGE/PLATFORM/...
...
Made some helper class for files filtering.
platforms.txt now contains only one platform at a time.
Some cleanup in Compiler and AvrDudeUploader classes.
2011-12-30 15:46:04 +01:00
