]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2cbcd5 f44cbe9)
Merge branch 'bugfix/ESP_ERR_PING_BASE_collision' into 'master'
authorAngus Gratton <angus@espressif.com>
Wed, 7 Feb 2018 08:27:09 +0000 (16:27 +0800)
committerAngus Gratton <angus@espressif.com>
Wed, 7 Feb 2018 08:27:09 +0000 (16:27 +0800)
Change ESP_ERR_PING_BASE because of collision with ESP_ERR_TCPIP_ADAPTER_BASE

See merge request idf/esp-idf!1918


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.