summaryrefslogtreecommitdiffstats
path: root/keyboard
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | Merge pull request #4 from jackhumbert/masterAlex Johnstone2016-03-2713-1147/+2922
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯Alex Johnstone2016-03-272-1140/+1198
| * | | | | | | | | | | Merge pull request #3 from jackhumbert/masterAlex Johnstone2016-03-2592-41438/+33800
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | 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
| * | | | | | | | | | | Merge pull request #2 from jackhumbert/masterAlex Johnstone2016-03-2212-2730/+3994
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Meh -> HyperAlex Johnstone2016-03-221-1/+1
| * | | | | | | | | | | Update readme.mdAlex Johnstone2016-03-221-1/+1
| * | | | | | | | | | | Added photoAlex Johnstone2016-03-221-1/+1
| * | | | | | | | | | | Added real life layoutAlex Johnstone2016-03-221-0/+0
| * | | | | | | | | | | Added ReadmeAlex Johnstone2016-03-211-0/+111
| * | | | | | | | | | | added .hexAlex Johnstone2016-03-211-0/+1124
| * | | | | | | | | | | typosAlex Johnstone2016-03-211-2/+2
| * | | | | | | | | | | Update keymap.cAlex Johnstone2016-03-211-6/+6
| * | | | | | | | | | | More updatesAlex Johnstone2016-03-211-14/+15
| * | | | | | | | | | | work in progressAlex Johnstone2016-03-201-28/+28
| * | | | | | | | | | | Started my keymapAlex Johnstone2016-03-111-0/+184
* | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-03-3072-1922/+4408
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #227 from NoahAndrews/patch-4Jack Humbert2016-03-301-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed minor issues with Preonic readmeNoah Andrews2016-03-301-2/+2
| * | | | | | | | | | | | Tiny fix of Planck diagramsMiha Rekar2016-03-301-2/+2
| |/ / / / / / / / / / /
| * | | | | | | | | | | preonic readmeJack Humbert2016-03-301-9/+3
| * | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2016-03-30155-41700/+38531
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Updated several keyboard folders to use new keymap naming schemeNoah Andrews2016-03-2939-40/+40
| | * | | | | | | | | | | Fix error in Planck makefile commentNoah Andrews2016-03-291-1/+1
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | Merge pull request #216 from msc654/masterErez Zukerman2016-03-286-0/+1334
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Corrected duplicate image issueMatthew Carroll2016-03-281-0/+0
| | | * | | | | | | | | | Added msc keymap for ergodox_ezMatthew Carroll2016-03-276-0/+1334
| | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge pull request #214 from cdlm/action-hookJack Humbert2016-03-282-15/+18
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Add action-preprocessing kb/user hooks in planckDamien Pollet2016-03-282-15/+18
| | | |/ / / / / / / / /
| | * / / / / / / / / / Magic Key Overrides / Keyboard Lock / Forced NKROIBNobody2016-03-282-13/+57
| | |/ / / / / / / / /
| * | | | | | | | | | .hex filesJack Humbert2016-03-303-2/+2893
| * | | | | | | | | | preonic updateJack Humbert2016-03-3019-1844/+64
* | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-03-2827-1153/+3708
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #211 from nrrkeene/masterErez Zukerman2016-03-2710-1147/+1232
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ 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 layoutMiguel Palhas2016-03-153-0/+1690
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #207 from romanzolotarev/masterErez Zukerman2016-03-251-1/+5
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | 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
| * | | | | | | | | Merge pull request #209 from n0bs/masterJack Humbert2016-03-236-0/+332
| |\ \ \ \ \ \ \ \ \