summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Removed preceeding underscore from MASTER_RIGHT in config.hXyverz2017-03-051-1/+1
* Merge remote-tracking branch 'upstream/master'Xyverz2017-03-0341-135/+1906
|\
| * Merge pull request #1126 from folkert4/masterJack Humbert2017-03-034-70/+95
| |\
| | * Various QOL changes:folkert42017-02-284-70/+95
| * | Merge pull request #1129 from unxmaal/unxmaal_spacefnJack Humbert2017-03-038-0/+710
| |\ \
| | * | gh60 satan spacefnEric Dodd2017-03-013-0/+160
| | * | gh60 spacefnEric Dodd2017-03-015-0/+550
| | |/
| * | Merge pull request #1130 from hot-leaf-juice/masterJack Humbert2017-03-032-11/+11
| |\ \ | | |/ | |/|
| | * moar hotkeysCallum Oakley2017-03-022-11/+11
| |/
| * Merge pull request #1124 from jmdaly/roadkit_firmwareJack Humbert2017-02-2814-0/+499
| |\
| | * Add initial version of TheVan Keyboards Roadkit FirmwareJohn M Daly2017-02-2814-0/+499
| * | Merge pull request #1125 from cwhits/upstreamJack Humbert2017-02-281-8/+8
| |\ \ | | |/ | |/|
| | * Update default maps for missing keysChris Helming2017-02-281-8/+8
| |/
| * Merge pull request #1116 from hot-leaf-juice/masterJack Humbert2017-02-272-12/+12
| |\
| | * updated readmeCallum Oakley2017-02-221-5/+5
| | * added hotkey clusterCallum Oakley2017-02-211-7/+7
| * | Merge pull request #1119 from phongnh/masterJack Humbert2017-02-271-1/+1
| |\ \
| | * | Removes redundant {} which cause build failure when DEBUG_ACTION is setPhong Nguyen2017-02-251-1/+1
| * | | Merge pull request #1121 from Leszek111/masterJack Humbert2017-02-275-0/+280
| |\ \ \ | | |/ / | |/| |
| | * | Ammend readme.md2017-02-271-2/+4
| | * | Add colemak_programmer2017-02-275-0/+278
| * | | Merge pull request #1118 from priyadi/promethiumJack Humbert2017-02-232-26/+33
| |\ \ \
| | * | | Fix UNICODE_MAP input_mode problemPriyadi Iman Nurcahyo2017-02-231-4/+6
| | * | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-2317-104/+360
| | |\ \ \
| | * | | | added pause, prtsc & ins to list of keys to be processed on releasePriyadi Iman Nurcahyo2017-02-211-2/+5
| | * | | | Move caps to FUN layer; add Pause keyPriyadi Iman Nurcahyo2017-02-211-12/+4
| | * | | | Move del back to fun+backspcePriyadi Iman Nurcahyo2017-02-211-3/+3
| | * | | | Only process Fnumber on key release, and only when layer is still activePriyadi Iman Nurcahyo2017-02-211-0/+10
| | * | | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-173-1/+3
| | |\ \ \ \
| | * | | | | Fix integer overflowPriyadi Iman Nurcahyo2017-02-161-6/+4
| | * | | | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-1621-531/+655
| | |\ \ \ \ \
| | * | | | | | reposition ins and del keyPriyadi Iman Nurcahyo2017-02-162-13/+17
| * | | | | | | Merge pull request #1117 from priyadi/fix_unicode_mapJack Humbert2017-02-231-4/+6
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Fix UNICODE_MAP input_mode problemPriyadi Iman Nurcahyo2017-02-231-4/+6
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #1113 from kesslern/masterJack Humbert2017-02-212-0/+240
| |\ \ \ \ \ \
| | * | | | | | Add dvorak_emacs_software layout for ergodoxNathan Kessler2017-02-202-0/+240
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #1115 from Skrymir/masterJack Humbert2017-02-211-13/+21
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge remote-tracking branch 'qmk/master'Josh Colbeck2017-02-211360-32215/+115460
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge pull request #4 from Skrymir/macroUpdatesJoshua Colbeck2016-07-201-13/+21
| | |\ \ \ \ \
| | | * | | | | Added reset keysJosh Colbeck2016-07-201-9/+10
| | | * | | | | Added open resource macroJosh Colbeck2016-07-121-5/+12
| | * | | | | | Merge pull request #3 from jackhumbert/masterJoshua Colbeck2016-07-202-10/+16
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
* | | | | | | | Final tweaks to my Kinesis keymap and readmeXyverz2017-03-032-22/+13
* | | | | | | | Updates to the README.mdXyverz2017-02-261-5/+5
* | | | | | | | Minor changes to the keymap: Moved thumb-cluster ESC to Media and Keypad layersXyverz2017-02-261-15/+15
* | | | | | | | Merge remote-tracking branch 'upstream/master'Xyverz2017-02-2068-1672/+1971
|\| | | | | | |
| * | | | | | | Merge pull request #1097 from stanleylai/masterJack Humbert2017-02-209-74/+60
| |\ \ \ \ \ \ \
| | * | | | | | | XD60: Added BL_TOGG back to keymap, with 6 backlight stepsStanley Lai2017-02-182-7/+4
| | * | | | | | | Updated XD60 readme and photos to reflect v2 PCBStanley Lai2017-02-184-2/+6
| | * | | | | | | Added support for XD60v2 with RGB underglow and LED backlight supportStanley Lai2017-02-135-72/+57