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
d52452d846
Merged 1.0.3
2012-12-10 15:55:05 +01:00
Federico Fissore
61eace3a23
fixed permissions on a lot of text files. see #1116
2012-12-10 10:42:49 +01:00
Cristian Maglie
b4f1e9ddf1
Moved 'firmware' folder in the proper place
2012-10-18 16:01:53 +02:00
Cristian Maglie
8d2896e06f
Merged upstream arduino branch
2012-10-18 15:50:09 +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