arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00
Code Activity

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 edccc2c158 71c3948918
commit c7e363ca7b
34 changed files with 901 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/Audio/src/Audio.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012 by Cristian Maglie <c.maglie@bug.st>
* Copyright (c) 2012 by Cristian Maglie <c.maglie@arduino.cc>
* Audio library for Arduino Due.
*
* This file is free software; you can redistribute it and/or modify

2
libraries/Audio/src/Audio.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012 by Cristian Maglie <c.maglie@bug.st>
* Copyright (c) 2012 by Cristian Maglie <c.maglie@arduino.cc>
* Audio library for Arduino Due.
*
* This file is free software; you can redistribute it and/or modify

2
libraries/Audio/src/DAC.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012 by Cristian Maglie <c.maglie@bug.st>
* Copyright (c) 2012 by Cristian Maglie <c.maglie@arduino.cc>
* DAC library for Arduino Due.
*
* This file is free software; you can redistribute it and/or modify

2
libraries/Audio/src/DAC.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012 by Cristian Maglie <c.maglie@bug.st>
* Copyright (c) 2012 by Cristian Maglie <c.maglie@arduino.cc>
* DAC library for Arduino Due.
*
* This file is free software; you can redistribute it and/or modify

2
libraries/Ethernet/src/utility/w5100.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010 by Cristian Maglie <c.maglie@bug.st>
* Copyright (c) 2010 by Cristian Maglie <c.maglie@arduino.cc>
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of either the GNU General Public License version 2

2
libraries/Ethernet/src/utility/w5100.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010 by Cristian Maglie <c.maglie@bug.st>
* Copyright (c) 2010 by Cristian Maglie <c.maglie@arduino.cc>
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of either the GNU General Public License version 2