rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-30 11:24:12 +01:00
Code Issues Releases Activity
3,760 Commits 7 Branches 93 Tags 2.9 GiB
b0ab27c47e
Commit Graph

6 Commits

Author SHA1 Message Date
Ankit Daftery
b0ab27c47e 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
81a5352811 Merge branch 'master' into ide-1.5.x 2014-07-01 19:07:55 +02:00
Cristian Maglie
62b723357c 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
66ee23b885 Merged 1.0.3 2012-12-10 15:55:05 +01:00
Federico Fissore
d458ef7806 fixed permissions on a lot of text files. see #1116 2012-12-10 10:42:49 +01:00
Cristian Maglie
b95a015284 Moved 'firmware' folder in the proper place 2012-10-18 16:01:53 +02:00