summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* testing moving the 6 to the left, having one key more on the right used for h...Stephan Bösebeck2016-02-152-1519/+1561
* Merge pull request #141 from XenoBits/masterErez Zukerman2016-02-125-0/+1489
|\
| * Another readme.md improvementMaxime Millet2016-02-121-9/+9
| * Improved readmeMaxime Millet2016-02-121-10/+10
| * Added C# developer keymapMaxime Millet2016-02-125-0/+1489
* | Merge pull request #140 from lasko/masterJack Humbert2016-02-111-0/+134
|\ \
| * | Added pageup, pagedown, home, and end keysLasko Height2016-02-111-6/+6
| * | Added a Tenkey layer and moved the del keyLasko Height2016-02-111-5/+25
| * | Adding my initial layoutLasko Height2016-02-111-1/+1
| * | Adding my initial layoutLasko Height2016-02-111-0/+114
|/ /
* | Merge pull request #139 from joarau/norwegian-colemak-ergodox-with-norwegian-...Erez Zukerman2016-02-115-0/+1470
|\ \
| * | Norwegian Colemak Ergodox and Norwegian key definitionsjoar2016-02-115-0/+1470
* | | More tweaks to experimental layoutErez Zukerman2016-02-113-18/+19
* | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman2016-02-1115-148/+4904
|\| |
| * | Merge pull request #138 from Willyfrog/masterErez Zukerman2016-02-104-0/+1666
| |\ \ | | |/ | |/|
| | * add imageGuillermo Vayá2016-02-101-0/+0
| | * added .hex fileGuillermo Vayá2016-02-101-0/+1472
| | * new emacs + osx + deadkeys layoutGuillermo Vayá2016-01-312-0/+194
| * | Merge pull request #137 from uzytkownik/masterErez Zukerman2016-02-103-0/+1770
| |\ \
| | * | Add mpiechotka ergodox ez keymapMaciej Piechotka2016-02-093-0/+1770
| |/ /
| * | Merge pull request #136 from cbbrowne/masterJack Humbert2016-02-081-148/+18
| |\ \
| | * | Eliminate switch statement by using contiguous character rangesChristopher Browne2016-02-081-152/+12
| | * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-02-0826-3455/+3814
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #130 from jacobono/jacobonoErez Zukerman2016-02-087-0/+1450
| |\ \ \
| | * | | add hex fileDaniel Mijares2016-02-061-0/+1142
| | * | | my personal ergodox keymap layoutDaniel Mijares2016-02-066-0/+308
| | | * | Add in XOR of lowest 8 bits of system timer to encourage more randomness of t...Christopher Browne2016-02-061-147/+157
* | | | | Corrects typoErez Zukerman2016-02-081-1/+1
|/ / / /
* | | | Updates documentation, adds Cmd/Win dual-function keyErez Zukerman2016-02-085-1443/+1098
* | | | Merge pull request #134 from dragon788/patch-2Jack Humbert2016-02-071-1/+1
|\ \ \ \
| * | | | Added note about using avr_setup.shdragon7882016-02-071-1/+1
|/ / / /
* | | | advanced macro stuff for READMEJack Humbert2016-02-071-4/+0
* | | | advanced macro stuff for READMEJack Humbert2016-02-071-1/+1
* | | | advanced macro stuff for READMEJack Humbert2016-02-071-9/+9
* | | | advanced macro stuff for READMEJack Humbert2016-02-071-2/+66
* | | | README changesJack Humbert2016-02-073-337/+4
* | | | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2016-02-0724-4295/+5163
|\ \ \ \
| * \ \ \ Merge pull request #131 from Vifon/patch-1Jack Humbert2016-02-071-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Use boolean AND instead of bitwise (possible typo)Wojciech Siewierski2016-02-071-1/+1
| |/ / /
| * | | Merge pull request #129 from cbbrowne/masterJack Humbert2016-02-051-57/+217
| |\| |
| | * | Remove obsolete commentsChristopher Browne2016-02-031-9/+0
| | * | Comment things moreChristopher Browne2016-02-031-1/+2
| | * | Random characters now working AOKChristopher Browne2016-02-031-14/+157
| | * | Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChristopher Browne2016-02-031-48/+60
| | |\ \
| | | * | More experiments with mapping, notably adding in the random bitsChristopher Browne2016-02-031-48/+60
| | | * | Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChristopher Browne2016-02-012-32/+68
| | | |\ \
| | | * \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-01-312-29/+163
| | | |\ \ \
| | * | \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-02-035-1315/+1453
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Set up a macro that writes cbbrowne. So that is a nice example of how it works.Christopher Browne2016-02-011-4/+4
| | * | | | | More samples, some not entirely working yet.Christopher Browne2016-02-011-13/+26