]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39e924b 7f2c6a9)
Merge branch 'master' into feature/modem_sleep
authorXia Xiaotian <xiaxiaotian@espressif.com>
Fri, 25 Nov 2016 07:27:46 +0000 (15:27 +0800)
committerXia Xiaotian <xiaxiaotian@espressif.com>
Fri, 25 Nov 2016 07:54:00 +0000 (15:54 +0800)
Conflicts:
components/esp32/lib

1  2 
components/esp32/lib patch | diff1 | diff2 | blob | history

diff --cc components/esp32/lib
index 3ee7a22306abf73aa4d270f566b273929de98d60,aa74ce27618c931fef8bdbdb683f80f4b364ba53..1ef5197246db363681ca78c1e3edc2d2cca92bbe
--- 1/components/esp32/lib
--- 2/components/esp32/lib
+++ b/components/esp32/lib
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 3ee7a22306abf73aa4d270f566b273929de98d60
 -Subproject commit aa74ce27618c931fef8bdbdb683f80f4b364ba53
++Subproject commit 1ef5197246db363681ca78c1e3edc2d2cca92bbe
Unnamed repository; edit this file 'description' to name the repository.