]> granicus.if.org Git - esp-idf/commit
Merge branch 'bugfix/system_restore_duplicate' into 'master'
authorAngus Gratton <angus@espressif.com>
Mon, 29 Jan 2018 06:02:02 +0000 (14:02 +0800)
committerAngus Gratton <angus@espressif.com>
Mon, 29 Jan 2018 06:02:02 +0000 (14:02 +0800)
commit12496599312224cfc296b33b6e091e63ee0537be
tree38cdf04d9f0816bcbba7a287fd371da89981eb81
parentdaa8cfa800677a71a3447eba418a4336979a3cb8
parent1979235df23c6c7ae3d3b462a52f0f46420bb941
Merge branch 'bugfix/system_restore_duplicate' into 'master'

esp32: remove duplicate definition of system_restore

See merge request idf/esp-idf!1864