* commit '71c39489180723b13cabe3c07e3994a239f8a03e':
Updated translations
Updated offline docs
Corrected some email contacts.
MacOS tests fix: new way of discovering work dir conflicts with tests execution. Fixed.
Updated build_pull_request.bash
Renamed mac build from "macosxnew" to "macosx-java-latest"
Updated revision log. Version set to 1.6.0rc3
build.xml and mac. Change in platform names: macosx now macosxnew, oldmacosx now macosx
Fixed bug with paths with spaces
build_pull_requests now builds oldmacosx as well
Macosx: new appbundler, new macosx builds. Use platform=macosx and platform=oldmacosx
build_pull_requests now moves the artifacts to the parent folder: this allows calling "clean" target before each build
build.xml linux-clean target was not deleting old linux builds
Fix typos in BlinkWithoutDelay.ino
Conflicts:
build/build.xml
* 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
...