Cristian Maglie
2312a1aad2
Merged 1.0.5
2013-05-29 18:30:36 +02:00
Cristian Maglie
1d176775b2
Merged 1.0.5
...
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Conflicts:
app/src/processing/app/Base.java
build/shared/revisions.txt
hardware/arduino/avr/cores/arduino/malloc.c
hardware/arduino/cores/arduino/avr-libc/malloc.c
hardware/arduino/cores/arduino/malloc.c
todo.txt
2013-04-03 13:51:04 +02:00
Cristian Maglie
599e7eee69
Merged upstream Arduino master branch
2012-06-26 00:51:35 +02:00
Cristian Maglie
828076175e
Merge of arduino-1.0.1. Work in progress...
2012-05-23 09:22:52 +02:00
Cristian Maglie
49d12c697e
Pre-merge upstream Arduino
2012-05-22 11:23:47 +02:00
Cristian Maglie
822dcb0989
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