summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-01-15Merge pull request #1005 from kd0kkv/patch-1Jack Humbert1-1/+1
2017-01-15Merge pull request #1006 from Vifon/masterJack Humbert3-6/+8
2017-01-15Merge pull request #1007 from bryan4887/bryanJack Humbert1-0/+226
2017-01-15Merge pull request #1009 from getclacking/masterJack Humbert1-1/+1
2017-01-15Typo fixJason Milkins1-1/+1
2017-01-14Added Bryan's keymapBryan Hernandez1-0/+226
2017-01-14Merge pull request #1004 from jackhumbert/hf/scmdErez Zukerman1-0/+4
2017-01-13Update quantum_keycodes.hJack Humbert1-2/+2
2017-01-13Update the vifon keymapWojciech Siewierski3-6/+8
2017-01-13Update keymap.ckd0kkv1-1/+1
2017-01-12A shot at aliasingErez Zukerman1-0/+2
2017-01-12Adds SCMD and SCMD_TErez Zukerman1-0/+2
2017-01-09Merge pull request #994 from priyadi/unicode_mods_fixJack Humbert1-8/+33
2017-01-09Merge pull request #993 from priyadi/greek_layerJack Humbert2-5/+193
2017-01-09Merge pull request #990 from replicaJunction/masterJack Humbert12-22/+536
2017-01-08Unregister all mods before inputting Unicode, and reregister afterwardsPriyadi Iman Nurcahyo1-8/+33
2017-01-08Greek alphabet layerPriyadi Iman Nurcahyo1-4/+183
2017-01-08Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethiumPriyadi Iman Nurcahyo0-0/+0
2017-01-08om telolet omPriyadi Iman Nurcahyo2-1/+10
2017-01-08om telolet omPriyadi Iman Nurcahyo2-1/+10
2017-01-07Removed build.batJoshua T1-51/+0
2017-01-07Merged from upstreamJoshua T336-3127/+39980
2017-01-07Updated README and images to reflect latest keymapJoshua T7-6/+10
2017-01-07Added another Shift on Extend layer.Joshua T1-8/+8
2017-01-07Updated Atreus layout to 0.4Joshua T1-26/+28
2017-01-07Increased TAPPING_TERM to 200Joshua T1-1/+3
2017-01-07Fixed key not matching its diagramJoshua T1-1/+1
2017-01-06Merge pull request #989 from ishigoya/masterJack Humbert5-0/+1016
2017-01-06 new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.pngishigoya5-3/+57
2017-01-06 new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.cishigoya1-0/+962
2017-01-05Merge pull request #983 from common-nighthawk/masterJack Humbert2-0/+222
2017-01-05Merge pull request #984 from deadcyclo/masterJack Humbert2-0/+283
2017-01-05Merge pull request #988 from jcowgar/masterJack Humbert2-0/+265
2017-01-04Added Jeremy’s developers keymap for the PlanckJeremy Cowgar2-0/+265
2017-01-03fix version macro making layer 3 sticky on deadcyclo layoutBrendan Johan Lee1-2/+2
2017-01-02Added the deadcyclo layoutBrendan Johan Lee2-0/+283
2017-01-02Update config.hJack Humbert1-1/+1
2017-01-02reverts change outside of personal keymap.Daniel1-2/+1
2017-01-02adds dedicated double-quote key.Daniel1-5/+9
2016-12-31Merge pull request #980 from TerryMathews/masterJack Humbert6-0/+340
2016-12-31Establish support for AMJPADTerryMathews6-0/+340
2016-12-30Merge pull request #975 from fredizzimo/remove_temp_filesJack Humbert1-66/+0
2016-12-30Merge pull request #976 from fredizzimo/fix_makefile_on_cygwinJack Humbert1-18/+3
2016-12-30Merge pull request #973 from Wilba6582/keycode_refactorJack Humbert4-314/+331
2016-12-30Merge pull request #971 from algernon/ergodox-ez/algernonJack Humbert3-6/+21
2016-12-30Merge pull request #974 from fredizzimo/remove_malloc_from_sysexJack Humbert4-27/+71
2016-12-30Merge pull request #972 from mechkeys/rgb_compatJack Humbert2-0/+3
2016-12-29Removed errant +Scott Wilson1-1/+1
2016-12-29Clean up the SKIP_GIT codeFred Sundvik1-17/+2
2016-12-29Remove extra parenthesis from MakefileFred Sundvik1-1/+1