summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix the quick aliases documentation sectionFred Sundvik2016-07-291-13/+15
* Merge pull request #584 from algernon/ergodox-ez/algernonErez Zukerman2016-07-294-28/+687
|\
| * ergodox_ez: Upgrade my keymap to v1.4Gergely Nagy2016-07-294-28/+687
* | Merge pull request #583 from coderkun/coderkun_neo2Erez Zukerman2016-07-292-7/+15
|\ \
| * | disable sleep LEDcoderkun2016-07-291-1/+2
| * | complete labels for modifiers in keymap schemacoderkun2016-07-291-2/+2
| * | use Ergodox EZ’s third LED for “scroll lock”coderkun2016-07-291-2/+9
| * | fix grave (GRV) and acute (ACUT) accentscoderkun2016-07-291-2/+2
| |/
* | Merge pull request #580 from MatsLanGoH/patch-1Erez Zukerman2016-07-291-1/+1
|\ \ | |/ |/|
| * Fixed a typoMatthias2016-07-291-1/+1
|/
* Merge pull request #578 from 0xdec/masterJack Humbert2016-07-284-0/+234
|\
| * Create 0xdec Preonic keymapJordi Orlando2016-07-284-0/+234
* | Merge pull request #577 from hot-leaf-juice/masterJack Humbert2016-07-283-0/+211
|\ \
| * | Added readme.md for custom layout.Callum Oakley2016-07-281-0/+48
| * | Added custom keymap.Callum Oakley2016-07-272-0/+163
* | | Merge pull request #573 from algernon/f/make-all-stop-on-errorJack Humbert2016-07-281-2/+2
|\ \ \ | |_|/ |/| |
| * | tmk_core/rules.mk: Make PRINT_ERROR* stop on errorGergely Nagy2016-07-271-2/+2
| |/
* | Merge pull request #572 from algernon/f/tap-dance-debugJack Humbert2016-07-282-0/+16
|\ \
| * | tap-dance: Add some debugging supportGergely Nagy2016-07-272-0/+16
| |/
* | Merge pull request #570 from sethbc/fix_bone2planck_buildJack Humbert2016-07-281-10/+8
|\ \
| * | remove unnecessary includesSeth Chandler2016-07-271-2/+0
| * | fix numerous errors in bone2planck keymapSeth Chandler2016-07-271-10/+10
| |/
* | Merge pull request #569 from sethbc/fix_stanleylai_warningsJack Humbert2016-07-281-10/+5
|\ \
| * | kill warnings filling up travis buildlogSeth Chandler2016-07-271-10/+5
| |/
* | Merge pull request #568 from sethbc/fix-colemak-osx-pc-noJack Humbert2016-07-281-1/+1
|\ \
| * | update NO_AMP to NO_AMPRSeth Chandler2016-07-271-1/+1
| |/
* | Merge pull request #566 from SmackleFunky/masterJack Humbert2016-07-281-2/+2
|\ \
| * | Allow toggling out of plover layerSmackleFunky2016-07-271-2/+2
| |/
* | Merge pull request #559 from Talljoe/fix-compiler-warningJack Humbert2016-07-281-1/+1
|\ \
| * | Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled.Joe Wasson2016-07-241-1/+1
* | | Merge pull request #564 from mazinbokhari/masterJack Humbert2016-07-282-0/+0
|\ \ \ | |_|/ |/| |
| * | Move to keyboardsMazin Bokhari2016-07-262-0/+0
|/ /
* | Merge pull request #562 from michaelklos/docErez Zukerman2016-07-261-1/+26
|\ \
| * | Added Tap Dance ExampleMichael Klos2016-07-261-1/+26
* | | Merge pull request #533 from mazinbokhari/masterErez Zukerman2016-07-262-0/+350
|\ \ \ | |/ / |/| |
| * | Delete default.pngerlo muvman2016-07-251-0/+0
| * | Delete default_highres.pngerlo muvman2016-07-251-0/+0
| * | Update readme.mderlo muvman2016-07-251-18/+18
| * | Update readme.mderlo muvman2016-07-251-18/+18
| * | Update readme.mderlo muvman2016-07-251-6/+0
| * | Update readme. My layout optimized for emacs & vimMazin Bokhari2016-07-171-0/+1
| * | Update readme. My layout optimized for emacs & vimMazin Bokhari2016-07-171-27/+61
| * | Merge branch 'master' of https://github.com/mazinbokhari/qmk_firmwareMazin Bokhari2016-07-171-5/+87
| |\ \
| | * | Update readme.mdMazin Bokhari2016-06-221-1/+1
| | * | Update readme.mdMazin Bokhari2016-06-221-50/+49
| | * | Update readme.mdMazin Bokhari2016-06-221-1/+1
| | * | Update readme.mdMazin Bokhari2016-06-221-1/+14
| | * | Update readme.mdMazin Bokhari2016-06-221-22/+22
| | * | Update readme.mdMazin Bokhari2016-06-221-0/+70
| * | | Add caps lock; sucks that there is no light for it...Mazin Bokhari2016-07-171-6/+2