summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | * | | | | | | | | testing moving the 6 to the left, having one key more on the right used for ↵Stephan Bösebeck2016-02-152-1519/+1561
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hash now feels a bit more natural to me. Need to investigate further.
| | | | | | | | | | | | | * | Updated hexAlex Johnstone2016-03-281-1139/+1138
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | ££££Alex Johnstone2016-03-281-1/+1
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | Forgot to change ent/spcAlex Johnstone2016-03-281-693/+697
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | Didn'tAlex Johnstone2016-03-281-2/+2
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯Alex Johnstone2016-03-271-6/+45
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | Merge pull request #4 from jackhumbert/masterAlex Johnstone2016-03-2717-1149/+2945
| | | | | | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | upstream
| * | | | | | | | | | | | | | Merge pull request #188 from DidierLoiseau/issue-156Erez Zukerman2016-03-274-2/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | Fix #156: clear weak mods on every key press
| | * | | | | | | | | | | | | Fix #156: clear weak mods on every key pressDidier Loiseau2016-03-084-2/+23
| | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - new macro_mods bit field for mods applied by macros - weak_mods now only used for ACT_{L,R}MODS (i.e. LSFT, RSFT, LCTL etc.) - clear the _weak_ mods on every key *pressed* such that LSFT etc. can no more interfere with the next key
| * | | | | | | | | | | | | Merge pull request #211 from nrrkeene/masterErez Zukerman2016-03-2710-1147/+1232
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ordinary Layout is unremarkably mundane and remarkably useful
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge https://github.com/jackhumbert/qmk_firmwareNicholas Keene2016-03-261-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene2016-03-2610-1109/+1192
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | The Ordinary Layout is familiar to users of common keyboardsNicholas Keene2016-03-241-58/+60
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #196 from naps62/naps62Erez Zukerman2016-03-273-0/+1690
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | Adds naps62's Ergodox EZ layout
| | * | | | | | | | | | | | Adds naps62's layoutMiguel Palhas2016-03-153-0/+1690
| | | | | | | | | | | | | |
| | | | | | | | | | | | * | Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯Alex Johnstone2016-03-272-1140/+1198
| | | | | | | | | | | | | |
| | | | | | | | | | | | * | Merge pull request #3 from jackhumbert/masterAlex Johnstone2016-03-2599-41470/+33848
| | | | | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | Pull upstream
| * | | | | | | | | | | | | Merge pull request #207 from romanzolotarev/masterErez Zukerman2016-03-251-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | Add important note about brightness on OS X
| | * | | | | | | | | | | | Add important note about brightness on OS XRoman Zolotarev2016-03-221-1/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #210 from n0bs/masterJack Humbert2016-03-232-16/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edited Bantam44 to work with jackhumbert/qmk_firmware pull #190
| | * | | | | | | | | | | | | Edited to work with jackhumbert/qmk_firmware pull #190Norberto Monarrez2016-03-232-16/+12
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"
| * | | | | | | | | | | | | Merge pull request #209 from n0bs/masterJack Humbert2016-03-236-0/+332
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added project folder for Bantam-44
| | * | | | | | | | | | | | | Added files for Bantam-44Norberto Monarrez2016-03-236-0/+332
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #200 from alexives/add_diagram_to_planck_layoutJack Humbert2016-03-231-5/+65
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | Added layout diagrams to the default planck keymap
| | * | | | | | | | | | | | | Added layout diagrams to the default planck keymapAlex Ives2016-03-161-5/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alex Ives <alex@ives.mn>
| * | | | | | | | | | | | | | Merge pull request #199 from IBNobody/masterJack Humbert2016-03-2211-6/+420
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | Added LED Indicator Support to QMK Template
| | * | | | | | | | | | | | | Fixed extra semicolons.IBNobody2016-03-222-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed extra semicolons.
| | * | | | | | | | | | | | | Fixed LED Function CallsIBNobody2016-03-224-34/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed LED indicator function calls to match how the matrix init function calls are formatted.
| | * | | | | | |