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 branch 'master' into matthijskooijman-ide-1.5.x-timer-variant

Browse Source 
Conflicts:
	app/src/processing/app/debug/Compiler.java
	hardware/arduino/sam/cores/arduino/main.cpp
This commit is contained in:
Cristian Maglie
2014-07-01 18:34:46 +02:00
parent e5f34e5a83 668559fc6f
commit c2c122b079
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/shared/revisions.txt
View File

@ -42,6 +42,7 @@ The following changes are included also in the (not yet released) Arduino IDE 1.
* avr: Improved USB-CDC read code (Paul Brook)
* avr: Fixed race condition in USB-CDC transmit (Paul Brook)
* Fixed wrong NULL pointer handling in Stream class (Amulya Kumar Sahoo)
* Added initVariant() hook to allow 3rd party variant-specific initialization
[ide]
* Fix toolchain command line to compile assembler files (Jimmy Hedman)
@ -302,6 +303,7 @@ ARDUINO 1.0.6 - not yet released
* Backported String class from IDE 1.5.x (Matt Jenkins)
* Backported Print class from IDE 1.5.x
* Backported digitalPinToInterrupt macro from IDE 1.5.x
* Added initVariant() hook to allow 3rd party variant-specific initialization
[ide]
* Added compatibility for IDE 1.5.x libraries layout