summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #735 from romanzolotarev/patch-1Jack Humbert2016-09-081-1/+1
|\
| * Fix typoRoman Zolotarev2016-09-081-1/+1
* | Merge pull request #733 from cbbrowne/masterJack Humbert2016-09-083-15/+38
|\ \
| * | Borrowed joint Shift/Enter idea from sgoodwin mappingcbbrowne2016-09-072-1/+2
| * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-09-0745-797/+2748
| |\|
| * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-29139-5814/+6444
| |\ \
| * \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-2650-288/+2915
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-2418-5/+1081
| |\ \ \ \
| * | | | | More notescbbrowne2016-08-241-3/+4
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-2298-606/+8317
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-1551-1245/+3312
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-128-0/+467
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-107-4/+775
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-0915-14/+585
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-084-206/+187
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-04247-1869/+4634
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-286-23/+366
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-261-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-2577-329/+6522
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Notes about changesChristopher Browne2016-07-181-8/+8
| * | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-152-0/+213
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-1245-663/+1107
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | I did not like Space Cadet paren; it jumps in in way too many extra casesChristopher Browne2016-07-121-1/+1
| * | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-0796-143/+5158
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-0466-18/+6982
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-3056-377/+870
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-288-167/+275
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-24214-139582/+1711
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-238-0/+1489
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Use Space Cadet parens on LSFTChristopher Browne2016-06-221-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-223-7/+28
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #730 from IBNobody/masterJack Humbert2016-09-083-7/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Added User Print - A "light" console out option (#8)IBNobody2016-09-072-3/+11
| * | | | | | | | | | | | | | | | | | | | | | | Use keyboard config for nkro (#7)IBNobody2016-09-062-4/+5
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #732 from romanzolotarev/masterErez Zukerman2016-09-062-27/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Change CTL_T(KC_ESC) to KC_LCTRL and update readmeRoman Zolotarev2016-09-072-27/+40
| |/ / / / / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / / / / norwegian programmer-friendly layoutjoar2016-09-066-0/+420
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #728 from fitzsim/yoruianErez Zukerman2016-09-066-0/+277
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Fix ergodox_yoruian XKB namingThomas Fitzsimmons2016-09-062-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | Add new ErgoDox EZ keymap, YORUIANThomas Fitzsimmons2016-09-056-0/+277
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #686 from coderkun/coderkun_neo2Erez Zukerman2016-09-052-7/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Add box-drawing Unicode characters to keymap “coderkun_neo2”coderkun2016-08-261-6/+6
| * | | | | | | | | | | | | | | | | | | | | | | | Set Unicode input mode and override unicode_input_start() method to keymap ...coderkun2016-08-261-2/+14
| * | | | | | | | | | | | | | | | | | | | | | | | Disable debugging for Ergodox keymap “coderkun_neo2”coderkun2016-08-262-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #678 from algernon/ergodox-ez/algernonErez Zukerman2016-09-058-523/+552
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | ergodox: Update algernon's keymap to v1.6Gergely Nagy2016-08-248-523/+552
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | |