Skip to content

Commit 986aa86

Browse files
committed
Merge branch 'master' into master
2 parents 234f917 + 234a874 commit 986aa86

File tree

134 files changed

+35632
-1016
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+35632
-1016
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ tools/esptool/
55
tools/mkspiffs/
66
package/versions/
77
exclude.txt
8+
tools/sdk/lib/liblwip_src.a
9+
tools/sdk/lwip/src/build
10+
tools/sdk/lwip/src/liblwip_src.a

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ If you find this forum or the ESP8266 Boards Manager package useful, please cons
3434
##### Stable version ![](http://arduino.esp8266.com/stable/badge.svg)
3535
Boards manager link: `http://arduino.esp8266.com/stable/package_esp8266com_index.json`
3636

37-
Documentation: [http://esp8266.github.io/Arduino/versions/2.1.0/](http://esp8266.github.io/Arduino/versions/2.1.0/)
37+
Documentation: [http://esp8266.github.io/Arduino/versions/2.2.0/](http://esp8266.github.io/Arduino/versions/2.2.0/)
3838

3939
##### Staging version ![](http://arduino.esp8266.com/staging/badge.svg)
4040
Boards manager link: `http://arduino.esp8266.com/staging/package_esp8266com_index.json`
4141

42-
Documentation: [http://esp8266.github.io/Arduino/versions/2.1.0-rc2/](http://esp8266.github.io/Arduino/versions/2.1.0-rc2/)
42+
Documentation: [http://esp8266.github.io/Arduino/versions/2.2.0-rc1/](http://esp8266.github.io/Arduino/versions/2.2.0-rc1/)
4343

4444
### Using git version
4545
[![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino) [![codecov.io](https://codecov.io/github/esp8266/Arduino/coverage.svg?branch=master)](https://codecov.io/github/esp8266/Arduino?branch=master)

0 commit comments

Comments
 (0)