summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-1151-2722/+4081
|\
| * [Erez & Jack] Documents audio outputErez Zukerman2016-05-101-0/+49
| * Update build guide with instructions to copy the whole keymap folder (#315)Peter2016-05-091-2/+2
| * Backlight Breathing for Planck and AtomicJack Humbert2016-05-0921-201/+1153
| * quantum accommodates more than 16 columnsJack Humbert2016-05-091-5/+12
| * Adds next tab/prev tab back to symb layer and updates legendErez Zukerman2016-05-082-4/+4
| * A little more tweakingErez Zukerman2016-05-082-12/+12
| * Tweaks layers 1 & 2 in my experimental layoutErez Zukerman2016-05-083-29/+37
| * Merge pull request #311 from adiabatic/ergodox-zweihander-osxErez Zukerman2016-05-063-10/+18
| |\
| | * Add KC_L[LR]ABK to top-level READMENathan Sharfi2016-05-061-0/+2
| | * Rearrange code layer on ZweihanderNathan Sharfi2016-05-061-6/+6
| | * Add KC_LABK and KC_RABK (< and >)Nathan Sharfi2016-05-061-0/+6
| | * zweihander: add ⌘X, ⌘C, ⌘V to media thumb keysNathan Sharfi2016-05-061-4/+4
| * | Merge pull request #310 from nrrkeene/masterErez Zukerman2016-05-0611-1317/+1400
| |\ \
| | * | The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-05-052-1075/+1075
| | * | The Ordinary Layout is extraordinarily familiar and powerfulNicholas Keene2016-05-0511-1325/+1373
| | * | The Ordinary Layout is the most natural and powerful layout for the Ergodox E...Nicholas Keene2016-05-049-1249/+1284
| * | | Uses @eltang's famous macro! Still not perfect though :(Erez Zukerman2016-05-052-1150/+1162
| * | | [Erez & Jack] Updates docs with one-shot information and config_user.hErez Zukerman2016-05-051-1/+13
| * | | [Jack & Erez] Defines MOD_HYPR and MOD_MEHErez Zukerman2016-05-051-0/+3
| * | | [Jack & Erez] Creates a makefile.mk and a config file for the experimental la...Erez Zukerman2016-05-052-0/+13
| * | | [Jack & Erez] Enables config_user.h per keymapErez Zukerman2016-05-051-0/+16
| * | | [Jack & Erez] Adds an option for user-specific config.h filesErez Zukerman2016-05-051-0/+9
| * | | [Jack & Erez] Removes duplicate reference, sorts whitespaceErez Zukerman2016-05-051-2/+3
| * | | adds keycode shortcuts for OSL and OSMJack Humbert2016-05-052-0/+14
| * | | Adds oneshot layer and oneshot tap toggling (#308)Thiago Alves2016-05-055-14/+186
| * | | Referencing the hex file (#309)Tom Duckering2016-05-051-2/+2
| * | | updates atreus's column mappingJack Humbert2016-05-051-1/+1
* | | | 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 pull request #305 from nrrkeene/masterErez Zukerman2016-05-047-1548/+1505
| |\| |
| | * | The Ordinary Layout is arranged as close as possible to a traditional keyboar...Nicholas Keene2016-05-032-5/+5
| | * | The Ordinary Layout works the way you expect it to, with extra powerful featuresNicholas Keene2016-05-031-979/+1008
| | * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareNicholas Keene2016-05-02255-7159/+39956
| | |\ \
| | * | | The Ordinary Layout is the layout you are looking for. Come and see v3.14.Nicholas Keene2016-05-017-1541/+1469
* | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-0417-892/+1447
|\| | | |
| * | | | Merge pull request #304 from adiabatic/ergodox-zweihander-osxErez Zukerman2016-05-031-0/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | zweihander: comment out action_get_macro()Nathan Sharfi2016-05-031-0/+3
| * | | | Clarified audio.c (#302)IBNobody2016-05-0316-892/+1444
| | |_|/ | |/| |
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-031-58/+50
|\| | |
| * | | Merge pull request #300 from Twey/tweymap-momentaryErez Zukerman2016-05-021-58/+50
| |\ \ \
| | * | | Swap steno/media layers to allow using media keys in the Plover layer; displa...James ‘Twey’ Kay2016-05-021-58/+50
| |/ / /
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-0214-0/+5137
|\| | |
| * | | Merge pull request #298 from adiabatic/ergodox-zweihander-osxErez Zukerman2016-05-023-0/+1381
| |\| |
| | * | zweihander: move dim/brighten to 1/2, add ⌘QNathan Sharfi2016-05-012-11/+11
| | * | zweihander: Add ⌘`, ⌘⇧`, ⌥⇥, ⌥⇧⇥Nathan Sharfi2016-05-013-11/+16
| | * | Ergodox EZ: add zweihander-osx.hexNathan Sharfi2016-04-301-0/+1152
| | * | ergodox-zweihander: initial commitNathan Sharfi2016-04-302-0/+224
| * | | Merge pull request #294 from sneako/masterErez Zukerman2016-05-023-0/+1345
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 10:31:42 +0000