]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f02ceb7 a79c5b8)
Merge branch 'bugfix/name_conflict_esp32_project_ld' into 'master'
authorIvan Grokhotkov <ivan@espressif.com>
Fri, 15 Mar 2019 03:42:20 +0000 (11:42 +0800)
committerIvan Grokhotkov <ivan@espressif.com>
Fri, 15 Mar 2019 03:42:20 +0000 (11:42 +0800)
esp32: Rename esp32.common.ld to esp32.project.ld to avoid build errors when downgrading

See merge request idf/esp-idf!4484

1  2 
tools/ci/test_build_system.sh patch | diff1 | diff2 | blob | history
tools/ci/test_build_system_cmake.sh patch | diff1 | diff2 | blob | history

diff --cc tools/ci/test_build_system.sh
Simple merge
diff --cc tools/ci/test_build_system_cmake.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.