Commit Graph

4 Commits

Author SHA1 Message Date
Cristian Maglie 99fa1b0cbb 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
qperez42@gmail.com 4d5358d307 fix Descriptor.c 2014-08-25 09:52:10 +02:00
Federico Fissore c453e0a32e fixed permissions on a lot of text files. see #1116 2012-12-10 10:42:49 +01:00
David A. Mellis 6225a85960 Moving ATmegaXXU2 firmwares into subdirectory. 2012-09-13 10:39:59 -04:00