aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-2618-51/+613
|\
| * Merge pull request #827 from Dbroqua/masterJack Humbert2016-10-263-6/+88
| |\ | | | | | | Updated dbroqua layout for HHKB keyboard and added new layout for KC60
| | * - Added HHKB like layout for KC60 pcbdbroqua2016-10-162-0/+82
| | |
| | * Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua2016-10-1441-293/+1921
| | |\
| | | * Merge pull request #9 from jackhumbert/masterDamien2016-10-1322-35/+1252
| | | |\ | | | | | | | | | | Merge from jackhumbert
| | | * \ Merge pull request #8 from jackhumbert/masterDamien2016-10-0719-258/+669
| | | |\ \ | | | | | | | | | | | | Merge from jackhumbert
| | * | | | - Updated dbroqua layout for HHKB keyboard (added some missing fn keys)dbroqua2016-10-031-6/+6
| | |/ / /
| * | | | Merge pull request #849 from hot-leaf-juice/masterJack Humbert2016-10-261-4/+4
| |\ \ \ \ | | | | | | | | | | | | tiny keymap change
| | * | | | replace lock key with general power keyCallum Oakley2016-10-251-2/+2
| | | | | |
| | * | | | switched to standard volume keysCallum Oakley2016-10-251-2/+2
| | | | | |
| * | | | | Merge pull request #848 from andrebeat/fix-dockerfileJack Humbert2016-10-261-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Add subproject env var to dockerfile
| | * | | | | add subproject env var to dockerfileAndre Silva2016-10-241-1/+2
| | |/ / / /
| * | | | | Merge pull request #847 from yinshanyang/masterJack Humbert2016-10-261-0/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | added notes on using Arduino Pro Micro 3.3V with Let’s Split
| | * | | | | added notes on using Arduino Pro Micro 3.3V with Let’s SplitYin Shanyang2016-10-241-0/+13
| | |/ / / /
| * | | | | Merge pull request #844 from priyadi/unicode_wincompose_inputJack Humbert2016-10-262-4/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | Unicode WinCompose input method
| | * | | | | Unicode WinCompose input methodPriyadi Iman Nurcahyo2016-10-232-4/+10
| | |/ / / /
| * | | | | Merge pull request #842 from priyadi/unicode_map_lengthJack Humbert2016-10-262-9/+35
| |\ \ \ \ \ | | | | | | | | | | | | | | UNICODE_MAP: remove 5 char limit; ignore leading zeroes; handle OS limitations
| | * | | | | UNICODE_MAP: remove 5 char limit; ignore leading zeroes; handle OS limitationsPriyadi Iman Nurcahyo2016-10-232-9/+35
| | |/ / / /
| * | | | | Merge pull request #841 from jacwib/masterJack Humbert2016-10-263-27/+118
| |\ \ \ \ \ | | | | | | | | | | | | | | Update jacwib keymap to version 1.2
| | * | | | | 1.2 updatejacwib2016-10-233-20/+105
| | | | | | |
| | * | | | | Update readme to reflect 1.1 changes.jacwib2016-10-221-1/+1
| | | | | | |
| | * | | | | Update keymap to reflect 1.1 changes.jacwib2016-10-221-9/+9
| | | | | | |
| | * | | | | Update readme to reflect changesjacwib2016-10-221-0/+6
| | |/ / / /
| * | | | | Merge pull request #831 from kejadlen/masterJack Humbert2016-10-265-0/+261
| |\ \ \ \ \ | | | | | | | | | | | | | | add alphadox layouts to atreus and ergodox
| | * | | | | [alphadox] remove tmk reset codeAlpha Chen2016-10-252-10/+0
| | | | | | |
| | * | | | | [ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interruptAlpha Chen2016-10-251-0/+3
| | | | | | |
| | * | | | | add alphadox layouts to atreus and ergodoxAlpha Chen2016-10-255-0/+268
| | |/ / / /
| * | | | | Merge pull request #834 from kazufukurou/masterJack Humbert2016-10-261-0/+82
| |\ \ \ \ \ | | |/ / / / | |/| | | | add programmer dvorak keymap
| | * | | | add programmer dvorak keymapArtyom Mironov2016-10-191-0/+82
| | | | | |
* | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChris Browne2016-10-230-0/+0
|\ \ \ \ \ \
| * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-2010-0/+676
| |\| | | | |
| * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-1823-127/+873
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmwarecbbrowne2016-10-170-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-1711-72/+497
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-10-2333-127/+1549
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge pull request #833 from h-parks/masterErez Zukerman2016-10-208-0/+482
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Win10 Writer's Block - An ErgoDox Keymap
| | * | | | | | | Win10 Writer's Block - An ErgoDox Keymaph-parks2016-10-192-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for compiling on infinity: replaced `_delay_ms()' with `wait_ms()' included "wait.h"
| | * | | | | | | Win10 Writer's Block - An ErgoDox Keymaph-parks2016-10-188-0/+479
| | | |_|/ / / / | | |/| | | | | | | | | | | | | This is a QWERTY layout for ErgoDox on QMK. It's designed to work well in MS Office-like environments. It's tested on Windows 7 and 10.
| * | | | | | | Merge pull request #832 from PhoenixRion/masterErez Zukerman2016-10-202-0/+194
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Phoenix Layout
| | * | | | | | update header fileRyan Ascheman2016-10-181-1/+1
| | | | | | | |
| | * | | | | | didn't read PR comment close enough, correcting folderRyan Ascheman2016-10-182-0/+0
| | | | | | | |
| | * | | | | | moving keymap to new locationRyan Ascheman2016-10-182-0/+0
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'upstream/master'Ryan Ascheman2016-10-186939-2419915/+106820
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (1239 commits) Update ez.c removes planck/rev3 temporarily Move hand_swap_config to ez.c, removes error for infinity Update Makefile ergodox: Update algernon's keymap to v1.9 Added VS Code dir to .gitignore Support the Pegasus Hoof controller. [Jack & Erez] Simplifies and documents TO add readme use wait_ms instead of _delay_ms add messenger init keymap Add example keymap Adding whiskey_tango_foxtrot_capslock ergodox keymap Unicode map framework. Allow unicode up to 0xFFFFF using separate mapping table CIE 1931 dim curve Apply the dim curve to the RGB output Update the Cluecard readme files Tune snake and knight intervals for Cluecard Tunable RGB light intervals ...
| * | | | | | | Merge pull request #829 from r2d2rogers/masterJack Humbert2016-10-182-21/+22
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Move hand_swap_config to ez.c, removes error for infinity
| | * | | | | | | Update ez.cRob Rogers2016-10-181-1/+0
| | | | | | | | |
| | * | | | | | | Move hand_swap_config to ez.c, removes error for infinityRob Rogers2016-10-172-20/+22
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge pull request #824 from dsvensson/pegasushoofJack Humbert2016-10-1811-0/+662
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Support the Pegasus Hoof controller.
| | * | | | | | | Support the Pegasus Hoof controller.Daniel Svensson2016-10-1311-0/+662
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacement controller for Filco Majestouch TKL keyboards. matrix.c ported from: https://github.com/BathroomEpiphanies/epiphanies_tmk_keyboard More details: http://bathroomepiphanies.com/controllers/
| * | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareJack Humbert2016-10-189-103/+189
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #826 from algernon/ergodox-ez/algernonErez Zukerman2016-10-179-103/+189
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | ergodox: Update algernon's keymap to v1.9
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 16:34:06 +0000