summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-05-24178-11646/+27263
|\
| * 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
| * | | Folders for each keymap.c file (#332)Jacob Bilger2016-05-1525-1151/+0
| * | | cleans up default keymaps (olkb)Jack Humbert2016-05-154-184/+7
| * | | updates midi functionality (#331)Jack Humbert2016-05-158-17/+103
| * | | splits process_action up to handle records separately (#329)Jack Humbert2016-05-155-40/+58
| * | | adds a sequencer to the music mode (#330)Jack Humbert2016-05-155-81/+122
| * | | Leader key implementation (#326)Erez Zukerman2016-05-1520-64/+290
| * | | Adds explanatory note re history of TMK and QMKErez Zukerman2016-05-141-1/+1
| * | | adds Bilger321's planck keymapJacob Bilger2016-05-144-0/+1208
| * | | Merge pull request #320 from Townk/townkmapErez Zukerman2016-05-138-0/+1624
| |\ \ \
| | * | | Remove unused variable on the keymap.Thiago Alves2016-05-111-2/+0
| | * | | Add an initial Readme to the keymap.Thiago Alves2016-05-114-0/+77
| | * | | Tweak some key positions and changed macro location.Thiago Alves2016-05-102-1242/+1229
| | * | | Add custom config.h and revert the changes on the global one.Thiago Alves2016-05-103-2/+94
| | * | | Update the .hex file on the keymap folder.Thiago Alves2016-05-091-1166/+1179
| | * | | Revert the Makefile to the original one.Thiago Alves2016-05-092-1/+3
| | * | | Change the access to the extra layer to be simetric.Thiago Alves2016-05-092-27/+27
| | * | | Add my personal keymap for OSX use.Thiago Alves2016-05-094-1/+1456
| * | | | Merge pull request #317 from Twey/masterErez Zukerman2016-05-132-25/+27
| |\ \ \ \
| | * | | | keymaps/twey: fix documentationJames ‘Twey’ Kay2016-05-101-2/+2
| | * | | | keymaps/twey: Plover 3.0 has a standard TOGGLE keybinding; use that insteadJames ‘Twey’ Kay2016-05-102-11/+13
| | * | | | keymaps/twey: Add more history keys to media layer; stop using toggleable med...James ‘Twey’ Kay2016-05-101-12/+12
| * | | | | Merge pull request #307 from sboesebeck/masterErez Zukerman2016-05-135-11/+1503
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-1151-2722/+4081
| | |\ \ \ \
| | * | | | | remove typoStephan Bösebeck2016-05-051-1/+1
| | * | | | | making default osx more ELG conformStephan Bösebeck2016-05-051-4/+4
| | * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-057-1548/+1505
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-0417-892/+1447
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-031-58/+50
| | |\ \ \ \ \ \ \