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

3 Commits

Author SHA1 Message Date
Cristian Maglie
44bcd2040b Merge branch 'master' into ide-1.5.x
Conflicts:
	app/src/processing/app/Base.java
	build/build.xml
	todo.txt
2014-09-16 12:19:39 +02: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