summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Xyverz2017-04-0641-120/+1456
|\
| * Set Bootloader Size to 4K Adam Lee2017-04-041-1/+1
| * Merge branch 'miuni32-OA'Adam YH Lee2017-04-0310-0/+390
| |\
| | * Add B1gtuna Miuni32Adam YH Lee2017-04-0310-0/+390
| * | Merge pull request #1206 from Dan-Saunders/patch-2Jack Humbert2017-04-031-0/+72
| |\ \
| | * | Create twolayer.cDan Saunders2017-04-031-0/+72
| * | | Merge branch 'master' into masterJack Humbert2017-04-03123-399/+6642
| |\| |
| | * | Merge pull request #1204 from nooges/lets-split-fixesJack Humbert2017-04-0313-120/+120
| | |\ \
| | | * | Include use of either TRS or TRRSDanny Nguyen2017-04-031-3/+2
| | | * | Remove flip-half from keymapDanny Nguyen2017-04-031-1/+0
| | | * | Update Let’s Split readmeDanny Nguyen2017-04-031-3/+9
| | | * | Move SSD1306 function declarations to header fileDanny Nguyen2017-04-035-14/+21
| | | * | Move defines for RGB to after the config.h includeDanny Nguyen2017-04-031-10/+7
| | | * | Rename COMPACT_KEYMAP to KC_KEYMAP and move to lets_split.hDanny Nguyen2017-04-033-41/+21
| | | * | Revise KEYMAP macro to make left and right halves more clearDanny Nguyen2017-04-032-52/+52
| | | * | Move defines for RGB to after the config.h includeDanny Nguyen2017-04-031-7/+7
| | | * | Revert removal of avrdude make optionDanny Nguyen2017-04-032-2/+14
| | * | | disables space cadet rolloverErez Zukerman2017-04-031-0/+3
| | |/ /
| | * | Merge pull request #1194 from tong92/masterJack Humbert2017-04-024-0/+223
| | |\ \
| | | * | Adds tong92's keymap to tv44=2017-04-024-0/+223
| | * | | Merge pull request #1195 from fudanchii/kbodJack Humbert2017-04-0210-0/+446
| | |\ \ \
| | | * | | Use tap-toggle to move between layers.Nurahmadie2017-04-021-4/+4
| | | * | | Fix layer stuck, and add numpad supportNurahmadie2017-04-022-10/+15
| | | * | | Forgot semicolon, and add reference linkNurahmadie2017-04-022-2/+4
| | | * | | Add READMENurahmadie2017-04-022-18/+13
| | | * | | Enable alt-F4 without [Fn]Nurahmadie2017-04-021-21/+41
| | | * | | Add capslock led, and audio buttonsNurahmadie2017-04-021-16/+26
| | | * | | Remove lead keys, fix some typos, rearrange layersNurahmadie2017-04-022-29/+10
| | | * | | Add initial keymapNurahmadie2017-04-022-28/+73
| | | * | | Initial work for my kbod support in qmk_firmwareNurahmadie2017-04-0210-0/+388
| | | |/ /
| | * | | Merge pull request #1196 from Dbroqua/masterJack Humbert2017-04-022-0/+199
| | |\ \ \
| | | * | | Merge pull request #19 from qmk/masterDamien2017-04-02161-402/+10630
| | | |\| |
| | | * | | Merge remote-tracking branch 'origin/master'dbroqua2017-04-02199-2022/+8382
| | | |\ \ \
| | | * | | | - Added MX HHKB like for gh60 with 7u space bardbroqua2017-04-022-0/+199
| * | | | | | Update ssd1306.cishtob2017-04-031-0/+2
* | | | | | | Added readmeXyverz2017-04-061-0/+89
* | | | | | | Reworked Atreus keymap, added READMEXyverz2017-04-061-44/+146
| |/ / / / / |/| | | | |
* | | | | | Merge remote-tracking branch 'upstream/master'Xyverz2017-04-02184-651/+11385
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Worked around some new Makefile issues.nielsenz2017-03-306-55/+55
| * | | | | changed hotkey cluster to accomodate awkward software... againCallum Oakley2017-03-301-1/+1
| * | | | | changed hotkey cluster to accomodate awkward softwareCallum Oakley2017-03-301-7/+7
| * | | | | Merge branch 'master' into to_pushZay9502017-03-29596-2652/+55289
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #1183 from Rovanion/real-masterJack Humbert2017-03-291-4/+17
| | |\ \ \ \ \
| | | * | | | | 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
| | * | | | | | Merge pull request #1182 from henxing/default_atreus_layoutJack Humbert2017-03-281-6/+6
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' into default_atreus_layoutHugh Enxing2017-03-2876-209/+3960
| | | |\ \ \ \ \ \
| | | * | | | | | | Swapped placement of `Ctrl` and `Alt` keys to match Technomancy'sHugh Enxing2017-03-241-6/+6
| | * | | | | | | | typo removed {3 ...Ole Anders2017-03-281-3/+2
| | * | | | | | | | fixed capitalization issue (checkTime => checktime)Ole Anders2017-03-281-2/+4