Cristian Maglie
|
f6dfdf5804
|
Update ArduinoWifiShield_upgrade_mac.sh
|
2014-07-01 19:11:19 +02:00 |
Ankit Daftery
|
95a53045b4
|
Update ArduinoWifiShield_upgrade.sh
File path should be updated, is wrong currently, will throw an error saying files missing.
|
2014-07-01 19:09:49 +02:00 |
|
Cristian Maglie
|
55c0101ab9
|
Merge branch 'master' into ide-1.5.x
|
2014-07-01 19:07:55 +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
|
d52452d846
|
Merged 1.0.3
|
2012-12-10 15:55:05 +01:00 |
|
Cristian Maglie
|
b4f1e9ddf1
|
Moved 'firmware' folder in the proper place
|
2012-10-18 16:01:53 +02:00 |