summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1005 from kd0kkv/patch-1Jack Humbert2017-01-151-1/+1
|\
| * Update keymap.ckd0kkv2017-01-131-1/+1
* | Merge pull request #1006 from Vifon/masterJack Humbert2017-01-153-6/+8
|\ \
| * | Update the vifon keymapWojciech Siewierski2017-01-133-6/+8
| |/
* | Merge pull request #1007 from bryan4887/bryanJack Humbert2017-01-151-0/+226
|\ \
| * | Added Bryan's keymapBryan Hernandez2017-01-131-0/+226
* | | Merge pull request #1009 from getclacking/masterJack Humbert2017-01-151-1/+1
|\ \ \
| * | | Typo fixJason Milkins2017-01-151-1/+1
|/ / /
* | | Merge pull request #1004 from jackhumbert/hf/scmdErez Zukerman2017-01-131-0/+4
|\ \ \ | |_|/ |/| |
| * | Update quantum_keycodes.hJack Humbert2017-01-131-2/+2
| * | A shot at aliasingErez Zukerman2017-01-121-0/+2
| * | Adds SCMD and SCMD_TErez Zukerman2017-01-111-0/+2
|/ /
* | Merge pull request #994 from priyadi/unicode_mods_fixJack Humbert2017-01-081-8/+33
|\ \
| * | Unregister all mods before inputting Unicode, and reregister afterwardsPriyadi Iman Nurcahyo2017-01-091-8/+33
* | | Merge pull request #993 from priyadi/greek_layerJack Humbert2017-01-082-5/+193
|\ \ \
| * | | Greek alphabet layerPriyadi Iman Nurcahyo2017-01-091-4/+183
| * | | Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethiumPriyadi Iman Nurcahyo2017-01-090-0/+0
| |\ \ \
| | * | | om telolet omPriyadi Iman Nurcahyo2017-01-082-1/+10
| * | | | om telolet omPriyadi Iman Nurcahyo2017-01-082-1/+10
| | |/ / | |/| |
* | | | Merge pull request #990 from replicaJunction/masterJack Humbert2017-01-0812-22/+536
|\ \ \ \ | |/ / / |/| | |
| * | | Removed build.batJoshua T2017-01-071-51/+0
| * | | Merged from upstreamJoshua T2017-01-07336-3127/+39980
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #989 from ishigoya/masterJack Humbert2017-01-065-0/+1016
|\ \ \ \
| * | | | new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.pngishigoya2017-01-065-3/+57
| * | | | new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.cishigoya2017-01-061-0/+962
|/ / / /
* | | | Merge pull request #983 from common-nighthawk/masterJack Humbert2017-01-042-0/+222
|\ \ \ \
| * | | | reverts change outside of personal keymap.Daniel2017-01-011-2/+1
| * | | | adds dedicated double-quote key.Daniel2017-01-011-5/+9
| * | | | removes double-tab brackets and adds back quot to left cmd.Daniel2016-12-061-10/+10
| * | | | removes the double actions from the metakeys.Daniel2016-11-271-17/+15
| * | | | moves brackets to top row.Daniel2016-11-181-9/+9
| * | | | moves brackets from J/K to U/I to remove block of common vim sequence.Daniel2016-09-061-8/+8
| * | | | adds tap dance and macro to move underscore and l- and r- brackets to base la...Daniel2016-09-022-25/+57
| * | | | adds Hyper key. improves media layer. first attempt at tap dance.Daniel2016-09-012-35/+43
| * | | | Merge remote-tracking branch 'upstream/master'Daniel2016-08-31439-13797/+30544
| |\ \ \ \
| * | | | | minor tweaks to numpad and media layerDaniel2016-08-141-26/+24
| * | | | | completes first-pass at media layerDaniel2016-08-121-15/+15
| * | | | | completes first-pass at symbol layerDaniel2016-08-121-36/+36
| * | | | | completes first-pass at base layerDaniel2016-08-101-0/+183
* | | | | | Merge pull request #984 from deadcyclo/masterJack Humbert2017-01-042-0/+283
|\ \ \ \ \ \
| * | | | | | fix version macro making layer 3 sticky on deadcyclo layoutBrendan Johan Lee2017-01-031-2/+2
| * | | | | | Added the deadcyclo layoutBrendan Johan Lee2017-01-022-0/+283
* | | | | | | Merge pull request #988 from jcowgar/masterJack Humbert2017-01-042-0/+265
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Added Jeremy’s developers keymap for the PlanckJeremy Cowgar2017-01-042-0/+265
|/ / / / / /
* | | | | | Update config.hJack Humbert2017-01-021-1/+1
* | | | | | Merge pull request #980 from TerryMathews/masterJack Humbert2016-12-316-0/+340
|\ \ \ \ \ \
| * | | | | | Establish support for AMJPADTerryMathews2016-12-316-0/+340
|/ / / / / /
* | | | | | Merge pull request #975 from fredizzimo/remove_temp_filesJack Humbert2016-12-301-66/+0
|\ \ \ \ \ \
| * | | | | | Remove extra file that has been commited by mistakeFred Sundvik2016-12-291-66/+0
* | | | | | | Merge pull request #976 from fredizzimo/fix_makefile_on_cygwinJack Humbert2016-12-301-18/+3
|\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 08:30:15 +0000