summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | Missed removing a functionZach Nielsen2016-11-102-46/+0
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Removed some common functions from my keymapnielsenz2016-11-104-24/+6
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Missed some stuff. Added a song (stole it from reddit).Zach Nielsen2016-11-106-122/+19
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Adding my (zach) keymaps for planck and preonicZach Nielsen2016-11-108-0/+1422
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Keep unicode's input_mode through a power cycleZach Nielsen2016-11-102-0/+7
| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1188 from hot-leaf-juice/masterJack Humbert2017-03-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed hotkey cluster to accomodate awkward software... again
| * | | | | | | | | | | | | | | | | | | | | | | | changed hotkey cluster to accomodate awkward software... againCallum Oakley2017-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1187 from hot-leaf-juice/masterJack Humbert2017-03-301-7/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed hotkey cluster to acommodate awkward software
| * | | | | | | | | | | | | | | | | | | | | | | | changed hotkey cluster to accomodate awkward softwareCallum Oakley2017-03-301-7/+7
| | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1185 from exiva/rn42_bluetoothJack Humbert2017-03-304-2/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add RN42 Bluetooth module support
| * | | | | | | | | | | | | | | | | | | | | | | | Add RN42 Bluetooth module supportTravis La Marr2017-03-294-2/+43
| |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for sending HID keycodes over the RN42/reflashed HC05 module. Tested on OS X and iOS.
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1184 from osamuaoki/masterJack Humbert2017-03-302-90/+144
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Update keymap.md to QMK
| * | | | | | | | | | | | | | | | | | | | | | | Update to match QMK keymapOsamu Aoki2017-03-301-89/+143
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Typo fixOsamu Aoki2017-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1183 from Rovanion/real-masterJack Humbert2017-03-291-4/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added instructions for how to build and flash the firmware with teensy_cli
| * | | | | | | | | | | | | | | | | | | | | | | | Added link to the teensy linux page.Rovanion Luckey2017-03-291-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Added instructions for how to build and flash the firmware with teensy_cli.Rovanion Luckey2017-01-241-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Clarify the quantum license (#1042)skullydazed2017-03-2889-1293/+2172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clarify the license for files we have signoff on * Update against the currently signed off files * Remove unused and not clearly licensed headers * Replace an #endif I accidentally removed while resolving merge conflicts
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1182 from henxing/default_atreus_layoutJack Humbert2017-03-281-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default atreus layout
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into default_atreus_layoutHugh Enxing2017-03-28101-782/+4925
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Swapped placement of `Ctrl` and `Alt` keys to match Technomancy'sHugh Enxing2017-03-241-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |