Commit graph

2 commits

Author SHA1 Message Date
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
Alex Stewart
1da996ee10 First batch of opensdk additions
Replacements for:
    libmain/misc.o
    libmain/os_cpu_a.o
    libmain/spi_flash.o
    libmain/timers.o
    libmain/uart.o
    libmain/xtensa_context.o
2015-10-10 22:14:08 -07:00