1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Arduino/arduino-core
Cristian Maglie ab92e42259 Merge branch 'master' into ide-1.5.x
Conflicts:
	app/src/processing/app/Serial.java
	app/src/processing/app/SerialMonitor.java
2014-12-23 16:41:38 +01:00
..
lib Moved specialized Platform classes and related resources to the 'arduino-core' project. 2014-11-13 16:34:25 +01:00
src Merge branch 'master' into ide-1.5.x 2014-12-23 16:41:38 +01:00
.classpath Moved specialized Platform classes and related resources to the 'arduino-core' project. 2014-11-13 16:34:25 +01:00
.gitignore Split IDE into 2 projects. 2014-11-13 16:34:24 +01:00
.project Split IDE into 2 projects. 2014-11-13 16:34:24 +01:00
build.xml arduino-core project is now correctly compiled through ant build script 2014-11-13 16:34:24 +01:00