1
0

Sync up the latest repo merging

This commit is contained in:
Jesse Vincent 2018-10-17 20:23:37 -07:00
parent 55ce987d63
commit 92155a6cd0
2 changed files with 1 additions and 76 deletions

75
.gitmodules vendored
View File

@ -16,78 +16,9 @@
[submodule "avr/libraries/HID"] [submodule "avr/libraries/HID"]
path = avr/libraries/HID path = avr/libraries/HID
url = https://github.com/keyboardio/Arduino-HID url = https://github.com/keyboardio/Arduino-HID
[submodule "avr/libraries/Kaleidoscope-OneShot"]
path = avr/libraries/Kaleidoscope-OneShot
url = https://github.com/keyboardio/Kaleidoscope-OneShot
[submodule "avr/libraries/Kaleidoscope-TapDance"]
path = avr/libraries/Kaleidoscope-TapDance
url = https://github.com/keyboardio/Kaleidoscope-TapDance
[submodule "avr/libraries/Kaleidoscope-Escape-OneShot"]
path = avr/libraries/Kaleidoscope-Escape-OneShot
url = https://github.com/keyboardio/Kaleidoscope-Escape-OneShot
[submodule "avr/libraries/Kaleidoscope-GhostInTheFirmware"]
path = avr/libraries/Kaleidoscope-GhostInTheFirmware
url = https://github.com/keyboardio/Kaleidoscope-GhostInTheFirmware
[submodule "avr/libraries/Kaleidoscope-TopsyTurvy"]
path = avr/libraries/Kaleidoscope-TopsyTurvy
url = https://github.com/keyboardio/Kaleidoscope-TopsyTurvy
[submodule "avr/libraries/Kaleidoscope-SpaceCadet"]
path = avr/libraries/Kaleidoscope-SpaceCadet
url = https://github.com/keyboardio/Kaleidoscope-SpaceCadet
[submodule "avr/libraries/Kaleidoscope-Leader"]
path = avr/libraries/Kaleidoscope-Leader
url = https://github.com/keyboardio/Kaleidoscope-Leader
[submodule "avr/libraries/Kaleidoscope-HostOS"]
path = avr/libraries/Kaleidoscope-HostOS
url = https://github.com/keyboardio/Kaleidoscope-HostOS
[submodule "avr/libraries/Kaleidoscope-Heatmap"]
path = avr/libraries/Kaleidoscope-Heatmap
url = https://github.com/keyboardio/Kaleidoscope-Heatmap
[submodule "avr/libraries/Kaleidoscope-LED-ActiveModColor"]
path = avr/libraries/Kaleidoscope-LED-ActiveModColor
url = https://github.com/keyboardio/Kaleidoscope-LED-ActiveModColor
[submodule "avr/libraries/Kaleidoscope-ShapeShifter"]
path = avr/libraries/Kaleidoscope-ShapeShifter
url = https://github.com/keyboardio/Kaleidoscope-ShapeShifter
[submodule "avr/libraries/Kaleidoscope-Ranges"]
path = avr/libraries/Kaleidoscope-Ranges
url = https://github.com/keyboardio/Kaleidoscope-Ranges
[submodule "avr/libraries/Kaleidoscope-Unicode"]
path = avr/libraries/Kaleidoscope-Unicode
url = https://github.com/keyboardio/Kaleidoscope-Unicode
[submodule "avr/libraries/Kaleidoscope-LEDEffects"]
path = avr/libraries/Kaleidoscope-LEDEffects
url = https://github.com/keyboardio/Kaleidoscope-LEDEffects
[submodule "avr/libraries/Kaleidoscope-Cycle"]
path = avr/libraries/Kaleidoscope-Cycle
url = https://github.com/keyboardio/Kaleidoscope-Cycle
[submodule "avr/libraries/Kaleidoscope-Syster"]
path = avr/libraries/Kaleidoscope-Syster
url = https://github.com/keyboardio/Kaleidoscope-Syster
[submodule "avr/libraries/Kaleidoscope"] [submodule "avr/libraries/Kaleidoscope"]
path = avr/libraries/Kaleidoscope path = avr/libraries/Kaleidoscope
url = https://github.com/keyboardio/Kaleidoscope url = https://github.com/keyboardio/Kaleidoscope
[submodule "avr/libraries/Kaleidoscope-EEPROM-Keymap-Programmer"]
path = avr/libraries/Kaleidoscope-EEPROM-Keymap-Programmer
url = https://github.com/keyboardio/Kaleidoscope-EEPROM-Keymap-Programmer
[submodule "avr/libraries/Kaleidoscope-FingerPainter"]
path = avr/libraries/Kaleidoscope-FingerPainter
url = https://github.com/keyboardio/Kaleidoscope-FingerPainter
[submodule "avr/libraries/Kaleidoscope-TypingBreaks"]
path = avr/libraries/Kaleidoscope-TypingBreaks
url = https://github.com/keyboardio/Kaleidoscope-TypingBreaks
[submodule "avr/libraries/Kaleidoscope-LED-Palette-Theme"]
path = avr/libraries/Kaleidoscope-LED-Palette-Theme
url = https://github.com/keyboardio/Kaleidoscope-LED-Palette-Theme.git
[submodule "avr/libraries/Kaleidoscope-Colormap"]
path = avr/libraries/Kaleidoscope-Colormap
url = https://github.com/keyboardio/Kaleidoscope-Colormap.git
[submodule "avr/libraries/Kaleidoscope-Steno"]
path = avr/libraries/Kaleidoscope-Steno
url = https://github.com/keyboardio/Kaleidoscope-Steno.git
[submodule "avr/libraries/Kaleidoscope-CycleTimeReport"]
path = avr/libraries/Kaleidoscope-CycleTimeReport
url = https://github.com/keyboardio/Kaleidoscope-CycleTimeReport
[submodule "avr/libraries/Model01-Firmware"] [submodule "avr/libraries/Model01-Firmware"]
path = avr/libraries/Model01-Firmware path = avr/libraries/Model01-Firmware
url = https://github.com/Keyboardio/Model01-Firmware url = https://github.com/Keyboardio/Model01-Firmware
@ -97,12 +28,6 @@
[submodule "avr/libraries/Kaleidoscope-HIDAdaptor-KeyboardioHID"] [submodule "avr/libraries/Kaleidoscope-HIDAdaptor-KeyboardioHID"]
path = avr/libraries/Kaleidoscope-HIDAdaptor-KeyboardioHID path = avr/libraries/Kaleidoscope-HIDAdaptor-KeyboardioHID
url = https://github.com/keyboardio/Kaleidoscope-HIDAdaptor-KeyboardioHID url = https://github.com/keyboardio/Kaleidoscope-HIDAdaptor-KeyboardioHID
[submodule "avr/libraries/Kaleidoscope-Qukeys"]
path = avr/libraries/Kaleidoscope-Qukeys
url = https://github.com/keyboardio/Kaleidoscope-Qukeys
[submodule "avr/libraries/Kaleidoscope-Redial"]
path = avr/libraries/Kaleidoscope-Redial
url = https://github.com/keyboardio/Kaleidoscope-Redial
[submodule "avr/libraries/Kaleidoscope-Hardware-EZ-ErgoDox"] [submodule "avr/libraries/Kaleidoscope-Hardware-EZ-ErgoDox"]
path = avr/libraries/Kaleidoscope-Hardware-EZ-ErgoDox path = avr/libraries/Kaleidoscope-Hardware-EZ-ErgoDox
url = https://github.com/keyboardio/Kaleidoscope-Hardware-EZ-ErgoDox url = https://github.com/keyboardio/Kaleidoscope-Hardware-EZ-ErgoDox

@ -1 +1 @@
Subproject commit 2e4012fa717345a7fad00134b71b2b22789f75b5 Subproject commit 76da3dc006e418f780964f9d3cfcfaef857c5303