]> granicus.if.org Git - esp-idf/commit
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)
commit75f564d7b556edc07dd0840f6c42b711a7c21218
tree7b3861464250086251d5bf78bba641ed84acb349
parente2cbcd5bc78fd82e24e170572a1a36ff85176df4
parentf44cbe90338cd1a68068bac3afe6cd1a7364ad14
Merge branch 'bugfix/ESP_ERR_PING_BASE_collision' into 'master'

Change ESP_ERR_PING_BASE because of collision with ESP_ERR_TCPIP_ADAPTER_BASE

See merge request idf/esp-idf!1918