From: Angus Gratton <angus@espressif.com>
Date: Wed, 7 Feb 2018 08:27:09 +0000 (+0800)
Subject: Merge branch 'bugfix/ESP_ERR_PING_BASE_collision' into 'master'
X-Git-Tag: v3.1-beta1~416
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75f564d7b556edc07dd0840f6c42b711a7c21218;p=esp-idf

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
---

75f564d7b556edc07dd0840f6c42b711a7c21218