summaryrefslogtreecommitdiffstats
path: root/keyboard
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-149-106/+577
|\
| * Disabled print.IBNobody2016-04-131-2/+2
| * Corrected spacing.IBNobody2016-04-131-11/+11
| * Corrected spacing.IBNobody2016-04-131-13/+15
| * Compiler Warnings / Atomic TLCIBNobody2016-04-136-28/+105
| * Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_planckIBNobody2016-04-1339-2647/+10816
| |\
| * | local filesIBNobody2016-04-132-8/+34
| * | LOCAL COMMITIBNobody2016-04-135-192/+263
| * | Adding PC AtomicIBNobody2016-04-134-68/+231
| * | Added delIBNobody2016-04-121-1/+1
| * | Adding personal filesIBNobody2016-04-123-3/+135
* | | 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
| * | | | Merge pull request #246 from romanzolotarev/masterErez Zukerman2016-04-115-5/+1331
| |\ \ \ \
| | * | | | Add HJKL layoutRoman Zolotarev2016-04-115-5/+1331
* | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-114-50/+113
|\| | | | |
| * | | | | Merge pull request #244 from nicosuave/add_nico_planck_keymapJack Humbert2016-04-111-0/+69
| |\ \ \ \ \
| | * | | | | Add my keymapNico Ritschel2016-04-091-0/+69
| * | | | | | Merge pull request #236 from tak3over/masterJack Humbert2016-04-112-49/+43
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | another modification of layers, restored arrow keys and added cut/pastetak3over2016-04-071-13/+31
| | * | | | | switched raise and lower layerstak3over2016-04-061-16/+13
| | * | | | | updated my keymaptak3over2016-04-051-3/+1
| | * | | | | Modified keymaptak3over2016-04-051-29/+10
| | * | | | | Update tak3over.ctak3over2016-04-041-27/+27
| | * | | | | Merge pull request #2 from jackhumbert/mastertak3over2016-04-0414-1268/+6053
| | |\ \ \ \ \
| | * | | | | | Minor documentation error. Raise and Lower.tak3over2016-04-041-5/+5
| * | | | | | | Links to build guideErez Zukerman2016-04-031-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-0612-11/+1780
|\| | | | | |
| * | | | | | 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-0596-3174/+12270
| |\ \ \ \ \ \
| | * | | | | | updates to noiseJack Humbert2016-04-055-5/+162
| | | |_|/ / / | | |/| | | |
| * | | | | | 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
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |