Merge branch 'bugfix/list_node_naming' into 'master'

Fix "list_node" name conflict in bluedroid & dhcp_server

See merge request !1216
This commit is contained in:
Ivan Grokhotkov
2017-09-12 12:10:54 +08:00
6 changed files with 143 additions and 124 deletions
@@ -33,6 +33,7 @@
#include "netif/ethernetif.h"
#include "apps/dhcpserver.h"
#include "apps/dhcpserver_options.h"
#include "esp_event.h"
#include "esp_log.h"