]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b07066 612db28)
Merge branch 'bugfix/err_code_collision' into 'master'
authorAngus Gratton <angus@espressif.com>
Tue, 3 Sep 2019 00:30:40 +0000 (08:30 +0800)
committerAngus Gratton <angus@espressif.com>
Tue, 3 Sep 2019 00:30:40 +0000 (08:30 +0800)
Fix error code collisions and re-enable CI check

Closes IDF-832

See merge request espressif/esp-idf!5923


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