summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* updates to preonic default, music mode integratedJack Humbert2016-04-162-95/+165
* added keymap_extras to pathJack Humbert2016-04-161-0/+1
* new defaults for planck and preonicJack Humbert2016-04-165-117/+308
* eeprom reset toolJack Humbert2016-04-162-0/+15
* audio on by defaultJack Humbert2016-04-151-1/+1
* audio enable stored in eepromJack Humbert2016-04-157-10/+89
* Merge pull request #256 from jackhumbert/new_defaultsJack Humbert2016-04-1511-64/+233
|\
| * [Erez & Jack] Documents tri-layer and keymap-specific makefile optionsErez Zukerman2016-04-071-1/+13
| * [Erez & Jack] Makes tri-layer available across QuantumErez Zukerman2016-04-073-9/+12
| * audio note length fixesJack Humbert2016-04-153-30/+33
| * the spacessssJack Humbert2016-04-155-47/+60
| * bootmagic somehow not getting enabled, so adding eeconfig to backlight src in...Jack Humbert2016-04-143-10/+5
| * might have broken somethingJack Humbert2016-04-142-3/+4
| * changing up the makefile a bitJack Humbert2016-04-146-60/+84
| * new defaultsJack Humbert2016-04-142-15/+133
|/
* Merge pull request #254 from IBNobody/masterJack Humbert2016-04-1314-113/+585
|\
| * Merge pull request #1 from IBNobody/pc_planckIBNobody2016-04-134-27/+29
| |\
| | * Added parenthesis to midi macro.IBNobody2016-04-131-1/+1
| | * Disabled print.IBNobody2016-04-131-2/+2
| | * Corrected spacing.IBNobody2016-04-131-11/+11
| | * Corrected spacing.IBNobody2016-04-131-13/+15
| | * Merge remote-tracking branch 'refs/remotes/origin/master' into pc_planckIBNobody2016-04-131-4/+4
| | |\ | | |/ | |/|
| * | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-04-131-4/+4
| |\ \ | |/ / |/| / | |/
* | Merge pull request #252 from Vifon/modifier-release-fixJack Humbert2016-04-131-4/+4
|\ \
| * | Optimize source_layers_cache for the cache memoryWojciech Siewierski2016-04-131-4/+4
|/ /
| * Merge https://github.com/IBNobody/qmk_firmware into pc_planckIBNobody2016-04-130-0/+0
| |\
| | * Merge remote-tracking branch 'refs/remotes/origin/pc_planck'IBNobody2016-04-138-87/+479
| | |\
| * | | Merge remote-tracking branch 'refs/remotes/origin/master' into pc_planckIBNobody2016-04-130-0/+0
| |\| |
| | * | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-04-1347-2736/+11041
| | |\ \ | |_|/ / |/| | |
| * | | Compiler Warnings / Atomic TLCIBNobody2016-04-1311-35/+113
| | |/ | |/|
| * | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_planckIBNobody2016-04-1347-2736/+11041
| |\ \ | |/ / |/| |
* | | Merge pull request #249 from nrrkeene/masterErez Zukerman2016-04-129-1325/+1685
|\ \ \
| * | | The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-111-8/+8
| * | | The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-113-1129/+1180
| * | | The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-119-1324/+1633
* | | | Merge pull request #248 from J3RN/masterErez Zukerman2016-04-122-18/+20
|\ \ \ \
| * | | | Merge pull request #1 from J3RN/vim-navigationJonathan Arnett2016-04-112-18/+20
|/| | | |
| * | | | Added README note about Vim-style navigationJonathan Arnett2016-04-111-3/+4
| * | | | Stylistic changesJonathan Arnett2016-04-111-1/+1
| * | | | Make a also toggle Media layerJonathan Arnett2016-04-111-1/+1
| * | | | Building a row of level switch buttonsJonathan Arnett2016-03-241-3/+3
| * | | | A to toggle L2, hjkl to move mouseJonathan Arnett2016-03-241-13/+14
* | | | | Merge pull request #246 from romanzolotarev/masterErez Zukerman2016-04-115-5/+1331
|\ \ \ \ \
| * | | | | Add HJKL layoutRoman Zolotarev2016-04-115-5/+1331
* | | | | | Merge pull request #244 from nicosuave/add_nico_planck_keymapJack Humbert2016-04-111-0/+69
|\ \ \ \ \ \
| * | | | | | Add my keymapNico Ritschel2016-04-091-0/+69
* | | | | | | Merge pull request #236 from tak3over/masterJack Humbert2016-04-112-49/+43
|\ \ \ \ \ \ \
| * | | | | | | another modification of layers, restored arrow keys and added cut/pastetak3over2016-04-071-13/+31
| * | | | | | | switched raise and lower layerstak3over2016-04-061-16/+13
| * | | | | | | updated my keymaptak3over2016-04-051-3/+1