summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* zweihander-osx: use eject instead of powerNathan Sharfi2016-05-312-1110/+1097
* Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi2016-05-312-4/+9
|\
| * Update to Makefile an ergodox readme (#365)Hartmut Goebel2016-05-312-4/+9
* | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi2016-05-3036-96/+3634
|\|
| * Merge pull request #353 from algernon/ergodox-ez/algernonErez Zukerman2016-05-2910-0/+3029
| |\
| | * ergodox_ez/algernon: Add a HEX fileGergely Nagy2016-05-261-0/+1259
| | * ergodox_ez/algernon: New layout.Gergely Nagy2016-05-269-0/+1770
| * | Add support for the KC60 v2.0 2015-09-12 (#360)Samuel Goodwin2016-05-297-0/+515
| * | Fix build errors (#359)Daniel Svensson2016-05-295-37/+15
| * | Corrects a backtickErez Zukerman2016-05-281-1/+1
| * | Corrects linksErez Zukerman2016-05-281-5/+5
| * | Adds a roadmap to the intro section of the docsErez Zukerman2016-05-281-2/+10
| * | makes .SILENT (less verbose) by default - override with VERBOSE=1Jack Humbert2016-05-282-14/+4
| * | process_record implementation (non-breaking for process_action ATM)Jack Humbert2016-05-282-0/+16
| * | updates quantum template to prevent backlight conflictsJack Humbert2016-05-281-1/+1
| * | brings alps64 up-to-date (needs testing)Jack Humbert2016-05-289-42/+44
* | | zweihander: Add :, disable sleep LED wavesNathan Sharfi2016-05-302-1/+3
* | | zweihander-osx: Add =, :, juggle Home/EndNathan Sharfi2016-05-271-8/+8
* | | zweihander-osx: Bump ALFRED_LEAD_TIME to 250msNathan Sharfi2016-05-262-5/+5
|/ /
* / removes duplicate double quote and odd whitespaceJack Humbert2016-05-261-9/+1
|/
* Merge pull request #352 from algernon/ergodox-ez/supercoderErez Zukerman2016-05-267-0/+965
|\
| * ergodox_ez: Add a SuperCoder keymapGergely Nagy2016-05-267-0/+965
|/
* Merge pull request #351 from adiabatic/masterErez Zukerman2016-05-254-1185/+1254
|\
| * Add single and double quotes to numpad layerNathan Sharfi2016-05-252-1181/+1240
| * Add double quote for everyone; update ZweihanderNathan Sharfi2016-05-253-4/+14
|/
* [Erez & Jack] Removes keyboards which are not active on qmkErez Zukerman2016-05-24227-18987/+201
* [Erez & Jack] Optimizes shift_interrupted arrayErez Zukerman2016-05-241-1/+1
* [Erez & Jack] Packages Space Cadet shifts into keycodesErez Zukerman2016-05-246-1212/+1104
* [Erez & Jack] Documents new Leader key functionalityErez Zukerman2016-05-245-1130/+1217
* Converted audio play functions to *_user (#349)Jack Humbert2016-05-2411-282/+215
* Clean up #343's code (#348)Eric Tang2016-05-242-7/+5
* updates midi in play_note to better octaveJack Humbert2016-05-231-2/+2
* Optimize matrix scanning (#343)Eric Tang2016-05-2321-505/+408
* adds petereichinger's planck keymap (#340)Peter2016-05-203-0/+239
* Merge pull request #324 from Bubblepoint/masterErez Zukerman2016-05-193-0/+1344
|\
| * readme addedTobias Matt2016-05-141-0/+7
| * Merge remote-tracking branch 'upstream/master'Tobias Matt2016-05-13134-10271/+23952
| |\
| * | switch shift and enter thumb keyTobias Matt2016-04-282-5/+5
| * | update hex fileTobias Matt2016-04-281-1/+1
| * | shift to thumb keyTobias Matt2016-04-281-3/+3
| * | add hex fileTobias Matt2016-04-261-0/+1152
| * | organize in subfolderTobias Matt2016-04-261-0/+0
| * | basic layoutBubblepoint2016-04-261-0/+185
* | | fixed small bug with AUDIO_ENABLED (#339)purpleP2016-05-191-21/+22
* | | adapts unicode to quantum.c (#333)Jack Humbert2016-05-1810-140/+609
* | | outputs size when make dfuingJack Humbert2016-05-181-1/+1
* | | adds music and audio toggles (#337)Jack Humbert2016-05-186-44/+114
* | | Added Swiss-German keymap. (#335)heartsekai2016-05-181-0/+102
* | | adds KC_NUBS, KC_NUHS and shifted versions to default keymapsJack Humbert2016-05-173-12/+12
* | | fixes default planck keymapJack Humbert2016-05-161-1/+0