Alex Stewart 769ca0d8f8 Merge branch 'master' into open-libmain ... Conflicts: core/include/esp/rtc_regs.h include/espressif/spi_flash.h		2016-03-22 16:24:50 -07:00
..
libmain	Merge branch 'master' into open-libmain	2016-03-22 16:24:50 -07:00
component.mk	First batch of opensdk additions	2015-10-10 22:14:08 -07:00