| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-24 | 62 | -41320/+32855 |
|\ |
|
| * | Pull request 190 resolution with 'qmk/master' for merge | yoyoerx | 2016-03-21 | 11 | -2340/+3603 |
| |\ |
|
| * | | PR190hotfix.sh, fresh hexes, makeallhex.sh script | yoyoerx | 2016-03-11 | 31 | -41292/+32866 |
| * | | Addressed void* return warning in all keymaps | yoyoerx | 2016-03-10 | 30 | -65/+65 |
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-22 | 4 | -0/+1309 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge pull request #205 from romanzolotarev/master | Erez Zukerman | 2016-03-21 | 4 | -0/+1309 |
| |\ \ |
|
| | * | | Update readme | Roman Zolotarev | 2016-03-19 | 1 | -1/+1 |
| | * | | Update layout | Roman Zolotarev | 2016-03-19 | 12 | -192/+67 |
| | * | | Swap volup and voldown | Roman Zolotarev | 2016-03-18 | 1 | -2/+2 |
| | * | | Add Roman's Layout | Roman Zolotarev | 2016-03-18 | 11 | -0/+1434 |
| | |/ |
|
* | | | fix number pad, add , | Stephan Bösebeck | 2016-03-20 | 1 | -1/+1 |
* | | | changing cursor keys, back to "default" cursor key layout, adding ISO-cursor ... | Stephan Bösebeck | 2016-03-20 | 1 | -4/+4 |
* | | | tweaking it a bit further, fixing things | Stephan Bösebeck | 2016-03-20 | 1 | -12/+12 |
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-20 | 7 | -2724/+2677 |
|\| | |
|
| * | | Merge pull request #203 from XenoBits/master | Erez Zukerman | 2016-03-20 | 5 | -1227/+1174 |
| |\ \ |
|
| | * | | Fixed png image | Maxime Millet | 2016-03-20 | 1 | -0/+0 |
| | * | | CSharp dev layout V2 | Maxime Millet | 2016-03-20 | 5 | -1227/+1174 |
| * | | | Add waits to prevent KVM from hanging | Maciej Piechotka | 2016-03-17 | 2 | -1490/+1492 |
| * | | | Put frequently used keys in shell (-=) under thumb | Maciej Piechotka | 2016-03-17 | 2 | -9/+9 |
| * | | | Add missing breaks in mpiechotka ergodox_ez keyboard | Maciej Piechotka | 2016-03-17 | 2 | -1233/+1237 |
| | |/
| |/| |
|
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-08 | 4 | -0/+1317 |
|\| | |
|
| * | | Adds a readme with a link to the blog post | Erez Zukerman | 2016-03-08 | 2 | -0/+5 |
| * | | The Ordinary Layout, designed to be similar to traditional keyboards, by Nich... | Nicholas Keene | 2016-03-06 | 3 | -0/+1312 |
* | | | forgot F6 | Stephan Bösebeck | 2016-03-02 | 2 | -2/+2 |
* | | | updated version, changed F-Key-Layout, minor change in code layer | Stephan Bösebeck | 2016-03-02 | 2 | -1481/+1479 |
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-03-02 | 3 | -1505/+1483 |
|\| | |
|
| * | | Merge pull request #157 from DidierLoiseau/typematrix | Jack Humbert | 2016-02-21 | 3 | -1505/+1483 |
| |\ \ |
|
| | * | | Updated tm2030 keymap.hex | Didier Loiseau | 2016-02-21 | 1 | -1482/+1476 |
| | * | | Fixed compilation warnings due to missing return statements | Didier Loiseau | 2016-02-21 | 1 | -1/+2 |
| | * | | FN macro: use layer_invert() instead of modifying layer_state directly | Didier Loiseau | 2016-02-07 | 1 | -20/+3 |
| | * | | Fixed inconsistency between comment and actual numeric layer | Didier Loiseau | 2016-02-07 | 1 | -1/+1 |
| | * | | Fixed link to Magic doc in Dvorak section | DidierLoiseau | 2016-02-07 | 1 | -1/+1 |
* | | | | testing moving the 6 to the left, having one key more on the right used for h... | Stephan Bösebeck | 2016-02-15 | 2 | -1519/+1561 |
|/ / / |
|
* | | | Merge pull request #141 from XenoBits/master | Erez Zukerman | 2016-02-12 | 5 | -0/+1489 |
|\ \ \
| | |/
| |/| |
|
| * | | Another readme.md improvement | Maxime Millet | 2016-02-12 | 1 | -9/+9 |
| * | | Improved readme | Maxime Millet | 2016-02-12 | 1 | -10/+10 |
| * | | Added C# developer keymap | Maxime Millet | 2016-02-12 | 5 | -0/+1489 |
* | | | Merge pull request #139 from joarau/norwegian-colemak-ergodox-with-norwegian-... | Erez Zukerman | 2016-02-11 | 4 | -0/+1429 |
|\ \ \ |
|
| * | | | Norwegian Colemak Ergodox and Norwegian key definitions | joar | 2016-02-11 | 4 | -0/+1429 |
* | | | | More tweaks to experimental layout | Erez Zukerman | 2016-02-11 | 3 | -18/+19 |
|/ / / |
|
* | | | Merge pull request #138 from Willyfrog/master | Erez Zukerman | 2016-02-10 | 4 | -0/+1666 |
|\ \ \
| |/ /
|/| | |
|
| * | | add image | Guillermo Vayá | 2016-02-10 | 1 | -0/+0 |
| * | | added .hex file | Guillermo Vayá | 2016-02-10 | 1 | -0/+1472 |
| * | | new emacs + osx + deadkeys layout | Guillermo Vayá | 2016-01-31 | 2 | -0/+194 |
* | | | Add mpiechotka ergodox ez keymap | Maciej Piechotka | 2016-02-09 | 3 | -0/+1770 |
* | | | Merge pull request #130 from jacobono/jacobono | Erez Zukerman | 2016-02-08 | 6 | -0/+1449 |
|\ \ \ |
|
| * | | | add hex file | Daniel Mijares | 2016-02-06 | 1 | -0/+1142 |
| * | | | my personal ergodox keymap layout | Daniel Mijares | 2016-02-06 | 5 | -0/+307 |
* | | | | Updates documentation, adds Cmd/Win dual-function key | Erez Zukerman | 2016-02-08 | 5 | -1443/+1098 |
|/ / / |
|
* | | | Fixes CM_SCLN and updates docs for Colemak | Erez Zukerman | 2016-02-05 | 2 | -5/+6 |