summaryrefslogtreecommitdiffstats
path: root/keyboard
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-209-2961/+3078
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-087-3/+1744
| |\ \ \ \ \ \ \
| * | | | | | | | forgot F6Stephan Bösebeck2016-03-022-2/+2
| | | | | | | | |
| * | | | | | | | updated version, changed F-Key-Layout, minor change in code layerStephan Bösebeck2016-03-022-1481/+1479
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-029-1524/+1650
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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-2713-1147/+2922
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | upstream
| * | | | | | | | | 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-2592-41438/+33800
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | |
| * | | | | | | | | 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>
| * | | | | | | | | | Fixed LED Function CallsIBNobody2016-03-222-24/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed LED indicator function calls to match how the matrix init function calls are formatted.
| * | | | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-2284-41564/+34408
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # quantum/template/template.c # quantum/template/template.h
| | * \ \ \ \ \ \ \ \ \ Pull request 190 resolution with 'qmk/master' for mergeyoyoerx2016-03-2113-2577/+4004
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | * | | | | | | | | | PR190hotfix.sh, fresh hexes, makeallhex.sh scriptyoyoerx2016-03-1133-41292/+32894
| | | | | | | | | | | |
| | * | | | | | | | | | Addressed void* return warning in all keymapsyoyoerx2016-03-1044-149/+128
| | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | Adding Retro_Refit KeyboardIBNobody2016-03-166-0/+400
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retro_Refit is an example of using a Teensy to replace a keyboard controller on an older keyboard. The original 6x15 keyboard had a non-standard 11x8 matrix.
* | | | | | | | | | New :pound: methodAlex Johnstone2016-03-231-1/+1
| | | | | | | | | |
* | | | | | | | | | New :pound: methodAlex Johnstone2016-03-231-1/+2
| | | | | | | | | |
* | | | | | | | | | New :pound: methodAlex Johnstone2016-03-231-2/+2
| | | | | | | | | |
* | | | | | | | | | New :pound: methodAlex Johnstone2016-03-231-0/+5
| | | | | | | | | |
* | | | | | | | | | New :pound: methodAlex Johnstone2016-03-232-1135/+1131
| | | | | | | | | |
* | | | | | | | | | Wrong dateAlex Johnstone2016-03-231-1/+1
| | | | | | | | | |
* | | | | | | | | | Removed whitespaceAlex Johnstone2016-03-221-55/+54
| | | | | | | | | |
* | | | | | | | | | Revised to version 0.1.0Alex Johnstone2016-03-224-979/+1010
| | | | | | | | | |