]> Repositories - Adafruit_Blinka-hackapet.git/commit
fix merge conflict in branch
authorMelissa LeBlanc-Williams <melissa@adafruit.com>
Thu, 16 Apr 2020 15:37:06 +0000 (08:37 -0700)
committerMelissa LeBlanc-Williams <melissa@adafruit.com>
Thu, 16 Apr 2020 15:37:06 +0000 (08:37 -0700)
commit51df1333e19ee8a3ad5832385e215bf4f2ecabcb
treecce6775f9b8a5a0f00fee31b388553582d43f69b
parent9f54be1eedfb4d8391c52cde8d0b03c16e9828a5
fix merge conflict in branch
13 files changed:
src/adafruit_blinka/board/onion/__init__.py [new file with mode: 0644]
src/adafruit_blinka/board/onion/omega2.py [new file with mode: 0644]
src/adafruit_blinka/microcontroller/generic_linux/periphery_pin.py [new file with mode: 0644]
src/adafruit_blinka/microcontroller/generic_linux/spi.py
src/adafruit_blinka/microcontroller/mips24kec/__init__.py [new file with mode: 0644]
src/adafruit_blinka/microcontroller/mips24kec/pin.py [new file with mode: 0644]
src/adafruit_blinka/microcontroller/mips24kec/spi.py [new file with mode: 0755]
src/adafruit_blinka/microcontroller/mips24kec/spi2.py [new file with mode: 0755]
src/board.py
src/busio.py
src/digitalio.py
src/microcontroller/__init__.py
src/microcontroller/pin.py