• Mikhail Karpenko's avatar
    Merge branch 'circbuf' · 0b1ebecc
    Mikhail Karpenko authored
    Conflicts resolved:
    	.gitignore
    	src/drivers/elphel/Kconfig
    	src/drivers/elphel/Makefile
    	src/include/elphel/driver_numbers.h
    0b1ebecc
.gitignore 289 Bytes
bin
tmp
Debug
Release
linux
sysroots
.project
.cproject
.externalToolBuilders
.settings
.pydevproject

# auto-generated files from x393 project
src/drivers/elphel/x393.c
src/drivers/elphel/x393.h
src/drivers/elphel/x393_defs.h
src/drivers/elphel/x393_map.h
src/drivers/elphel/x393_types.h