summaryrefslogtreecommitdiffstats
path: root/keyboard
Commit message (Expand)AuthorAgeFilesLines
* Compiler Warnings / Atomic TLCIBNobody2016-04-136-28/+105
* Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_planckIBNobody2016-04-1339-2647/+10816
|\
| * 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 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 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
| | | |_|/ / | | |/| | |
| | * | | | Merge pull request #235 from mbarkhau/masterErez Zukerman2016-04-042-92/+123
| | |\ \ \ \
| | | * | | | add indent to generated keymapManuel Barkhau2016-04-032-92/+123
| | * | | | | music mode fileJack Humbert2016-04-036-16/+1725
| | * | | | | Merge pull request #213 from mbarkhau/masterErez Zukerman2016-04-034-0/+2890
| | |\| | | |
| | | * | | | use action function for unicodeManuel Barkhau2016-04-024-2540/+1651
| | | * | | | Update compile_keymap.pymbarkhau2016-03-291-13/+11
| | | * | | | add hex fileManuel Barkhau2016-03-281-0/+1624
| | | * | | | Merge remote-tracking branch 'origin/master'Manuel Barkhau2016-03-2823-1175/+4331
| | | |\ \ \ \
| | | * | | | | Refactor compiler codeManuel Barkhau2016-03-283-1661/+1900
| | | * | | | | Add manuneo layoutManuel Barkhau2016-03-273-0/+1918
| | * | | | | | Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-04-0278-1924/+4833
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-0176-1894/+4803
| | | |\ \ \ \ \ \
| | | * | | | | | | minor tweaks at the keymap, new png for documentationStephan Bösebeck2016-04-012-6/+6
| | | * | | | | | | fixed de_osx prefix in keymap include to avoid conflictsStephan Bösebeck2016-03-311-25/+25
| | * | | | | | | | new keymapStephan Bösebeck2016-04-021-1/+9
| | |/ / / / / / /
| | * | | | | | | added CTL_Shift / Hash macroStephan Bösebeck2016-03-291-11/+24
| | * | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2824-1176/+4336
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | minor changesStephan Bösebeck2016-03-242-1113/+1111