1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-05 16:24:12 +01:00
Commit Graph

15 Commits

Author SHA1 Message Date
Federico Fissore
bef7b94ea7 merge 2013-10-14 12:42:42 +02:00
Federico Fissore
ddcb89e1fa Removed wrong executable flag on many files 2013-09-27 18:18:51 +02:00
Federico Fissore
6ba496d489 updated Yun bootloader 2013-06-21 17:40:59 +02:00
Cristian Maglie
22a84c69d3 Merge branch 'merge-1.0.5' into ide-1.5.x-discovery 2013-06-01 23:16:02 +02:00
Cristian Maglie
3394f61276 Merged 1.0.5 2013-05-29 18:30:36 +02:00
Federico Fissore
bf5ddb338b new yun bootloader 2013-05-23 11:07:18 +02:00
Federico Fissore
7e130a0c8b Etheris references renamed Yun without accent to avoid encoding issues 2013-05-23 09:53:56 +02:00
Federico Fissore
b97fdb451f Etheris bootloader
updated python bridge path
2013-05-14 16:51:42 +02:00
Cristian Maglie
8eadd4893f Moved old production firmware to the right place 2013-04-17 17:52:36 +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
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
33083d84b3 Merge of arduino-1.0.1. Work in progress... 2012-05-23 09:22:52 +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