summaryrefslogtreecommitdiffstats
path: root/keyboard
Commit message (Expand)AuthorAgeFilesLines
* Update tak3over.ctak3over2016-04-041-27/+27
* Merge pull request #2 from jackhumbert/mastertak3over2016-04-0414-1268/+6053
|\
| * 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
| | |\ \ \
| | | * | | Create tak3over.ctak3over2016-04-011-0/+136
| | * | | | 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
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2491-41409/+33727
| |\ \ \ \
| * \ \ \ \ 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-209-2961/+3078
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-087-3/+1744
| |\ \ \ \ \ \ \
| * | | | | | | | 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-029-1524/+1650
| |\ \ \ \ \ \ \ \
| * | | | | | | | | testing moving the 6 to the left, having one key more on the right used for h...Stephan Bösebeck2016-02-152-1519/+1561
* | | | | | | | | | Minor documentation error. Raise and Lower.tak3over2016-04-041-5/+5
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | adding files is always smartJack Humbert2016-04-017-0/+327
* | | | | | | | | Also add compiled hex fileDavid Mohr2016-03-301-0/+1127
* | | | | | | | | Squisher's international dvorak variant for ergodox ezDavid Mohr2016-03-305-0/+214
* | | | | | | | | 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
| |/ / / / / / / /
| * | | | | | | | Merge pull request #211 from nrrkeene/masterErez Zukerman2016-03-2710-1147/+1232
| |\ \ \ \ \ \ \ \