summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-1621-203/+840
|\
| * Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2016-04-161-0/+112
| |\
| | * Merge pull request #257 from VoodaGod/bone2planckJack Humbert2016-04-161-0/+112
| | |\ | | | | | | | | Bone2 Layout adptation for Planck
| | | * My Attempt at adapting the Bone2 layout with Neo2 navigation cluster & ↵Jason Janse van Rensburg2016-04-161-0/+112
| | | | | | | | | | | | | | | | | | | | | | | | number block to the Planck. Very much a WIP, will most likely start tweaking further once my Planck kit has dropped
| * | | 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
| |\ | | | | | | New default planck layout, audio fixes, makefile overwrites, tri-layer quantum-wide
| | * [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 ↵Jack Humbert2016-04-143-10/+5
| | | | | | | | | | | | include cond
| | * 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 branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-1415-117/+589
|\|
| * Merge pull request #254 from IBNobody/masterJack Humbert2016-04-1314-113/+585
| |\ | | | | | | Atomic TLC / Compiler Warning Fixes
| | * Merge pull request #1 from IBNobody/pc_planckIBNobody2016-04-134-27/+29
| | |\ | | | | | | | | Corrected minor spacing issues
| | | * 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 memory
| | * | Optimize source_layers_cache for the cache memoryWojciech Siewierski2016-04-131-4/+4
| |/ / | | | | | | | | | Swapping the array indices should increase the locality of the memory access.
| | * 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
| | | |/ | | |/| | | | | | | | | | | | | Corrected compiler warnings for a number of issues. Gave Atomic some TLC.
| | * | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_planckIBNobody2016-04-1347-2736/+11041
| | |\ \ | | |/ / | |/| |
| | * | local filesIBNobody2016-04-132-8/+34
| | | | | | | | | | | | | | | | local files
| | * | LOCAL COMMITIBNobody2016-04-135-192/+263
| | | | | | | | | | | | | | | | LOCAL COMMIT
| | * | Adding PC AtomicIBNobody2016-04-134-68/+231
| | | |
| | * | Added delIBNobody2016-04-121-1/+1
| | | |
| | * | Adding personal filesIBNobody2016-04-123-3/+135
| | |/
| | * Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-04-1114-0/+1804
| | |\
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-1216-1348/+3036
|\| | |
| * | | Merge pull request #249 from nrrkeene/masterErez Zukerman2016-04-129-1325/+1685
| |\ \ \ | | | | | | | | | | Version 3, Ordinary Perfected
| | * | | 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
| |\ \ \ \ | | | | | | | | | | | | Vim-style navigation for j3rn layout
| | * | | | Merge pull request #1 from J3RN/vim-navigationJonathan Arnett2016-04-112-18/+20
| |/| | | | | | | | | | | | | | | | Added Vim-style navigation
| | * | | | Added README note about Vim-style navigationJonathan Arnett2016-04-111-3/+4
| | | | | |