summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-1216-1348/+3036
|\
| * Merge pull request #249 from nrrkeene/masterErez Zukerman2016-04-129-1325/+1685
| |\
| | * The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-111-8/+8
| | * The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-113-1129/+1180
| | * The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-04-119-1324/+1633
| * | Merge pull request #1 from J3RN/vim-navigationJonathan Arnett2016-04-112-18/+20
| |\ \
| | * | Added README note about Vim-style navigationJonathan Arnett2016-04-111-3/+4
| | * | Stylistic changesJonathan Arnett2016-04-111-1/+1
| | * | Make a also toggle Media layerJonathan Arnett2016-04-111-1/+1
| | * | Building a row of level switch buttonsJonathan Arnett2016-03-241-3/+3
| | * | A to toggle L2, hjkl to move mouseJonathan Arnett2016-03-241-13/+14
| * | | Add HJKL layoutRoman Zolotarev2016-04-115-5/+1331
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-111-1/+1
|\| | |
| * | | Links to build guideErez Zukerman2016-04-031-1/+1
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-067-6/+1618
|\| | |
| * | | Merge pull request #215 from nrrkeene/masterErez Zukerman2016-04-063-6/+60
| |\ \ \ | | | |/ | | |/|
| | * | The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene2016-03-273-6/+60
| * | | Updated hexAlex Johnstone2016-04-051-893/+895
| * | | :pound: typoAlex Johnstone2016-04-051-0/+4
| * | | :pound: typoAlex Johnstone2016-04-051-1/+1
| * | | Merge pull request #5 from jackhumbert/masterAlex Johnstone2016-04-0519-1252/+6867
| |\ \ \
| * | | | 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
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯Alex Johnstone2016-03-272-1140/+1198
| * | | | Merge pull request #3 from jackhumbert/masterAlex Johnstone2016-03-2568-41382/+32976
| |\ \ \ \
| * | | | | 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-2211-2724/+3986
| |\ \ \ \ \
| * | | | | | 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_firmwareStephan Bösebeck2016-04-042-92/+123
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |