summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #804 from algernon/ergodox-ez/algernonErez Zukerman2016-10-039-175/+212
|\ \ \ \
| * | | | ergodox: Update algernon's keymap to v1.8Gergely Nagy2016-10-039-175/+212
|/ / / /
* | | | Merge pull request #799 from coderkun/masterJack Humbert2016-10-031-0/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Declare Unicode method hex_to_keycode() as “weak”coderkun2016-10-021-0/+1
| |/ /
* | | Merge pull request #798 from Dbroqua/masterJack Humbert2016-10-031-13/+35
|\ \ \
| * | | - Fixed key name in default layer definitiondbroqua2016-10-011-1/+1
| * | | Merge remote-tracking branch 'origin/master'dbroqua2016-10-0124-692/+1251
| |\ \ \
| | * | | Merge pull request #7 from jackhumbert/masterDamien2016-09-309-119/+443
| | |\| |
| | * | | Merge pull request #6 from jackhumbert/masterDamien2016-09-2915-573/+808
| | |\ \ \
| * | | | | - Updated dbroqua layout for HHKB keyboarddbroqua2016-10-011-13/+35
| |/ / / /
* | | | | Merge pull request #797 from hot-leaf-juice/masterJack Humbert2016-10-031-76/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Made some simplifications leveraging the LALT(), LGUI(), and S() functions.Callum Oakley2016-10-011-76/+6
|/ / / /
* | | | Merge pull request #788 from chwilk/kastyle-refreshErez Zukerman2016-09-304-36/+80
|\ \ \ \
| * | | | Added description of kastyle keymapchwilk2016-09-271-0/+14
| * | | | Moved hand_swap_config array so all keyboards get it definedchwilk2016-09-262-21/+24
| * | | | Updated kastyle keymap, including swap hands featurechwilk2016-09-261-36/+62
| * | | | Added ONEHAND_ENABLE to allow SWAP HANDS actionschwilk2016-09-261-0/+1
* | | | | Merge pull request #789 from cmclen/masterErez Zukerman2016-09-302-0/+149
|\ \ \ \ \
| * | | | | Remove config.hChris McLennon2016-09-281-93/+0
| * | | | | Contributing new keymap to ErgodoxChris McLennon2016-09-283-0/+242
* | | | | | Merge pull request #794 from AGausmann/midi-patchJack Humbert2016-09-291-1/+3
|\ \ \ \ \ \
| * | | | | | Missing ifdef statementAdam Gausmann2016-09-291-1/+3
* | | | | | | Merge pull request #792 from hot-leaf-juice/masterJack Humbert2016-09-292-82/+211
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge branch 'master' of https://github.com/hot-leaf-juice/qmk_firmwareCallum Oakley2016-09-290-0/+0
| |\ \ \ \ \ \
| | * | | | | | added en-dash and gbp keys and updated readmeCallum Oakley2016-09-292-96/+91
| | * | | | | | big restructure now I only have to consider macOS, also added mouse, more fun...Callum Oakley2016-09-281-23/+116
| | * | | | | | removed windows layer and updated brightness keys for macOS SierraCallum Oakley2016-09-281-76/+14
| | * | | | | | changed RALT to LALT on WindowsCallum Oakley2016-09-281-1/+1
| | * | | | | | fixed commentsCallum Oakley2016-09-281-10/+10
| | * | | | | | Update readme.mdCallum Oakley2016-09-281-9/+9
| | * | | | | | Update readme.mdCallum Oakley2016-09-281-2/+2
| | * | | | | | updated readmeCallum Oakley2016-09-282-28/+83
| | * | | | | | added close key for alt-f4 macroCallum Oakley2016-09-281-3/+14
| | * | | | | | added a toggle between Mac and Windows base layers (with swapped cmd and ctrl)Callum Oakley2016-09-281-11/+48
| | | |/ / / / | | |/| | | |
| * | | | | | added en-dash and gbp keys and updated readmeCallum Oakley2016-09-292-96/+91
| * | | | | | big restructure now I only have to consider macOS, also added mouse, more fun...Callum Oakley2016-09-291-23/+116
| * | | | | | removed windows layer and updated brightness keys for macOS SierraCallum Oakley2016-09-291-76/+14
| * | | | | | changed RALT to LALT on WindowsCallum Oakley2016-09-291-1/+1
| * | | | | | fixed commentsCallum Oakley2016-09-291-10/+10
| * | | | | | Update readme.mdCallum Oakley2016-09-291-9/+9
| * | | | | | Update readme.mdCallum Oakley2016-09-291-2/+2
| * | | | | | updated readmeCallum Oakley2016-09-292-28/+83
| * | | | | | added close key for alt-f4 macroCallum Oakley2016-09-291-3/+14
| * | | | | | added a toggle between Mac and Windows base layers (with swapped cmd and ctrl)Callum Oakley2016-09-291-11/+48
|/ / / / / /
* | | | | | Merge pull request #790 from IBNobody/masterJack Humbert2016-09-289-543/+574
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix #770, Fix #779IBNobody2016-09-282-7/+4
| * | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-09-288-30/+313
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #786 from mannkind/patch-1Jack Humbert2016-09-251-3/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix lets_split.c so that audio can be disabledDustin2016-09-251-3/+5
|/ / / / /
* | | | | Merge pull request #785 from jcowgar/masterJack Humbert2016-09-252-0/+111
|\ \ \ \ \