summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-09-0745-797/+2748
|\
| * Merge pull request #732 from romanzolotarev/masterErez Zukerman2016-09-062-27/+40
| |\
| | * Change CTL_T(KC_ESC) to KC_LCTRL and update readmeRoman Zolotarev2016-09-072-27/+40
| * | norwegian programmer-friendly layoutjoar2016-09-066-0/+420
| |/
| * Merge pull request #728 from fitzsim/yoruianErez Zukerman2016-09-066-0/+277
| |\
| | * Fix ergodox_yoruian XKB namingThomas Fitzsimmons2016-09-062-2/+2
| | * Add new ErgoDox EZ keymap, YORUIANThomas Fitzsimmons2016-09-056-0/+277
| * | Merge pull request #686 from coderkun/coderkun_neo2Erez Zukerman2016-09-052-7/+19
| |\ \
| | * | Add box-drawing Unicode characters to keymap “coderkun_neo2”coderkun2016-08-261-6/+6
| | * | Set Unicode input mode and override unicode_input_start() method to keymap ...coderkun2016-08-261-2/+14
| | * | Disable debugging for Ergodox keymap “coderkun_neo2”coderkun2016-08-262-1/+1
| * | | Merge pull request #678 from algernon/ergodox-ez/algernonErez Zukerman2016-09-058-523/+552
| |\ \ \ | | |_|/ | |/| |
| | * | ergodox: Update algernon's keymap to v1.6Gergely Nagy2016-08-248-523/+552
| * | | Merge pull request #724 from sgoodwin/masterJack Humbert2016-09-053-0/+268
| |\ \ \
| | * | | Add my keymap.Samuel Ryan Goodwin2016-09-053-0/+268
| * | | | Merge pull request #719 from IBNobody/masterJack Humbert2016-09-052-199/+238
| |\ \ \ \
| | * | | | Added diagonal mice macros, breathing ala AtomicIBNobody2016-09-042-199/+238
| | |/ / /
| * | | | Merge pull request #716 from MajorKoos/masterJack Humbert2016-09-057-0/+474
| |\ \ \ \
| | * | | | Add rules.mk fileMajor Koos2016-09-021-0/+69
| | * | | | Add support for JD40 MKII PCBMajor Koos2016-09-026-0/+405
| | |/ / /
| * | | | fixed incorrect key combination for locking screen on macOSCallum Oakley2016-09-022-5/+5
| * | | | changed some of the wording in the readmeCallum Oakley2016-09-011-4/+4
| * | | | changed order of modifiers after experimentation, updated readmeCallum Oakley2016-09-012-12/+7
| * | | | Merge remote-tracking branch 'upstream/master'Callum Oakley2016-09-01342-7039/+22799
| |\| | |
| | * | | Merge branch 'master'Jason Janse van Rensburg2016-08-30583-6781/+26180
| | |\ \ \
| | | * | | Update READMEJack Henahan2016-08-291-3/+9
| | | * | | jhenahan layoutJack Henahan2016-08-294-0/+383
| | * | | | include base config.h instead of copying itJason Janse van Rensburg2016-07-261-88/+5
| | * | | | added config.h, and missing Ins of filpped navigation layerJason Janse van Rensburg2016-07-262-3/+93
| | * | | | Merged branch master into bone2planckJason Janse van Rensburg2016-07-2531-244/+3166
| | |\ \ \ \
| | * | | | | added missing F keys in flipped layerJason Janse van Rensburg2016-07-251-6/+6
| | * | | | | added readmeJason Janse van Rensburg2016-07-241-0/+8
| | * | | | | moved insertJason Janse van Rensburg2016-07-241-5/+5
| | * | | | | moved ctrlJason Janse van Rensburg2016-07-241-11/+12
| | * | | | | fixed stupid errorsJason Janse van Rensburg2016-07-241-12/+17
| * | | | | | added a lock screen keyCallum Oakley2016-08-121-3/+16
| * | | | | | Merge remote-tracking branch 'upstream/master'Callum Oakley2016-08-09255-2062/+4267
| |\ \ \ \ \ \
| * | | | | | | updated readme.md to reflect keymap changesCallum Oakley2016-08-091-2/+2
| * | | | | | | changed order of bottom row of symbol layer to ease acess to bracketsCallum Oakley2016-08-091-2/+2
* | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-29139-5814/+6444
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge pull request #696 from fredizzimo/community_boardsJack Humbert2016-08-271-19/+28
| |\ \ \ \ \ \ \
| | * | | | | | | Update list of community keyboardsFred Sundvik2016-08-281-19/+28
| * | | | | | | | Merge pull request #689 from jeebak/tv44-jeebakJack Humbert2016-08-274-0/+596
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [tv44] Port jeebak's planck keymap to tv44JeeBak Kim2016-08-263-69/+538
| | * | | | | | | | [tv44] Add "jeebak" keymap folder as a copy of the "default" folderJeeBak Kim2016-08-264-0/+127
| * | | | | | | | | Merge pull request #684 from tomb0y/kc60_workman_deadJack Humbert2016-08-272-4/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Correct typo in kc60 workman-dead keymapzs2016-08-262-4/+4
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Rename infinity_chibios to infinity60, and add readmeFred Sundvik2016-08-2716-9/+37
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' into fix_line_endingsFred Sundvik2016-08-27102-2716/+2713
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-261-23/+142
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |