summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-cons...Noah Andrews2016-03-29147-40692/+40208
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #223 from NoahAndrews/patch-3Jack Humbert2016-03-291-4/+9
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix #198Noah Andrews2016-03-291-4/+9
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #222 from NoahAndrews/patch-2Jack Humbert2016-03-291-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix error in Planck makefile commentNoah Andrews2016-03-291-1/+1
| |/ / / / / / / / /
* | | | | | | | | | .hex filesJack Humbert2016-03-303-2/+2893
* | | | | | | | | | preonic updateJack Humbert2016-03-3020-1846/+66
| | | | * | | | | | 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-312-103/+103
| | | * | | | | | | 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-295-18/+55
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #219 from IBNobody/masterJack Humbert2016-03-284-13/+48
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Minor Tweaks and DocumentationIBNobody2016-03-283-12/+44
| | * | | | | | | | Added command to turn LED indicators off while sleepingIBNobody2016-03-281-1/+4
| * | | | | | | | | Merge pull request #220 from NoahAndrews/improve-buildguideJack Humbert2016-03-281-5/+7
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | Added clarifying steps to Windows section of build guideNoah Andrews2016-03-281-5/+7
| | * | | | | | | | Merge remote-tracking branch 'jackhumbert/master' into improve-buildguideNoah Andrews2016-03-28144-40683/+40157
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | / / / / / / | | | |/ / / / / / | | |/| | | | | |
| | | | * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2837-1306/+4820
| | | | |\ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | 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-286-21/+45
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add action-preprocessing kb/user hooks in planckDamien Pollet2016-03-282-15/+18
| | * | | | | | | | | Add action-preprocessing hook to keyboard templateDamien Pollet2016-03-282-6/+19
| | * | | | | | | | | Rename function to be keyboard-specificDamien Pollet2016-03-282-4/+4
| | * | | | | | | | | Add per-event user hook function to QMKDamien Pollet2016-03-282-0/+8
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #217 from IBNobody/masterJack Humbert2016-03-287-132/+488
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Magic Key Overrides / Keyboard Lock / Forced NKROIBNobody2016-03-287-132/+488
| | * | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-2718-1150/+2950
| | |\| | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-03-257-5/+393
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge pull request #218 from awpr/patch-1Jack Humbert2016-03-281-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Add avr-libc to the Debian build dependencies.Andrew Pritchard2016-03-281-3/+3
| |/ / / / / / / / /
| | | | | | * | | | minor changesStephan Bösebeck2016-03-242-1113/+1111
| | | | | | * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2498-41441/+33775
| | | | | | |\ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | | | | * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-224-0/+1309
| | | | | | |\ \ \ \
| | | | | | * | | | | fix number pad, add ,Stephan Bösebeck2016-03-201-1/+1
| | | | | | * | | | | changing cursor keys, back to "default" cursor key layout, adding ISO-cursor ...Stephan Bösebeck2016-03-201-4/+4
| | | | | | * | | | | tweaking it a bit further, fixing thingsStephan Bösebeck2016-03-201-12/+12
| | | | | | * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2011-2963/+3391
| | | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-0817-9/+1877
| | | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-03-032-1483/+1481
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | 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-0214-1527/+1761
| | | | | | | |\ \ \ \ \ \ \
| | | | | | * | \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-031-1/+1
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / | | | | | | | |/| | | | | | |
| | | | | | * | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-02-2413-1526/+1760
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / / | | | | | | |/| | | | | | | |
| | | | | | * | | | | | | | | testing moving the 6 to the left, having one key more on the right used for h...Stephan Bösebeck2016-02-152-1519/+1561
| | | | | | | | | | | | | * | Updated hexAlex Johnstone2016-03-281-1139/+1138
| | | | | | | | | | | | | * | ££££Alex Johnstone2016-03-281-1/+1