* commit 'b8b2869753d488bfd203615637e1de3912589a92': (68 commits)
Updated revisions.txt
Fixed wrong path in successful message
arduino-core: restored debug info in class files
Fixed NPE in case of missing boardData
Added missing translations
Added windows drivers
Added warning for uncertified boards
Update revision.txt
update revisions.txt
SoftwareSerial: match bool API with HardwareSerial
Fix to save as to parent folder is needed by all OSs, not just Mac
Update revision.txt
MacOSX: previous better IDE was missing some pieces. Added
MacOSX: better IDE
Updated revisions.txt
NEW button now behaves as clicking File -> New menu entry. Fixes#2685
Windows: bundled JRE updated to 8u31 build.xml now uses unzip target
Added .getParentFile() to saveas for mac. This prevents saving into the sketch itself
Compound edits weren't part of the undo/redo dance
An undoable action marks the sketh as modified
...
* master: (148 commits)
Update revision log
Cherry picked fix from 87865ac19d
Updated revision log
Added dependencies for AStylej.dll
Updated translations
Update revision log
Temporary fix for pulseIn() regression.
Added README.adoc for the library manager project
Fixed some libraries metadata.
Temporary disabled DefaultTargetTest under certain conditions
Updated translation from transifex
Updated some translation strings
Fixed test
sam: Fixed initialization of UART/USART mode register
update revision log
Fixed NPE when import menu are empty
Fixed NPE when currently selected platform is no more installed.
Optimized FileUtils.recursiveDelete(File) function
Fixed a bunch of simple warnings in java code
Removed unused classes Commander.java and Webserver.java
...
