arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

Merge arduino/master into esp8266

Browse Source 
* 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
This commit is contained in:
Ivan Grokhotkov 2015-02-09 17:37:44 +03:00
parent be7a068be1
commit a43d6ff9cb
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -29,12 +29,15 @@ build/macosx/dist/*.tar.gz
build/macosx/dist/*.tar.bz2
build/macosx/libastylej*
build/macosx/appbundler*.jar
build/macosx/appbundler*.zip
build/macosx/appbundler
build/linux/work/
build/linux/dist/*.tar.gz
build/linux/dist/*.tar.bz2
build/linux/*.tgz
build/linux/*.zip
build/linux/libastylej*
build/shared/reference*.zip
test-bin
*.iml
.idea