summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Xyverz2017-02-10107-739/+5883
|\
| * fixed readme (i swear)VoodaGod2017-02-101-4/+4
| * Merge pull request #1078 from VoodaGod/bone2planckJack Humbert2017-02-094-54/+142
| |\
| | * updated layout & readmeVoodaGod2017-02-092-37/+39
| | * more formattingVoodaGod2017-02-091-2/+13
| | * readme formatting changesVoodaGod2017-02-091-61/+61
| | * updated readmeVoodaGod2017-02-091-7/+10
| | * updated bone2planck keymap & readmeVoodaGod2017-02-094-26/+98
| * | [Typo] correct link to default keymap in readme.Rob Rogers2017-02-091-1/+1
| |/
| * Moved KC60 capslock LED code to standard led_set_kb so it can be overridden b...dungdung2017-02-073-34/+15
| * rename I2C_MASTER_RIGHT to MASTER_RIGHT since this works for serial as wellJimmy Chan2017-02-074-6/+10
| * udpate readme to reflect QMK and not having the Makefile from ahtn's repoJimmy Chan2017-02-071-14/+72
| * correctly put eeprom EE_HANDS at addr 0x0a (decimal 10). default to rev2 proj...Jimmy Chan2017-02-074-5/+7
| * Merge pull request #1072 from nicinabox/improve-ls-avrdude-targetJack Humbert2017-02-071-4/+6
| |\
| | * Check for a new serial port every secondNic Aitch2017-02-061-4/+6
| * | Merge pull request #1068 from adzenith/masterJack Humbert2017-02-072-4/+5
| |\ \
| | * | Add missing header to ergodox ordinary keymapNikolaus Wittenstein2017-02-031-0/+1
| | * | Fix compile warnings in egodox robot_test_layoutNikolaus Wittenstein2017-02-031-4/+4
| * | | Merge pull request #1046 from LukeSilva/masterJack Humbert2017-02-073-0/+382
| |\ \ \
| | * | | Add luke keymap, as an example of the tapping macrosLuke Silva2017-01-293-0/+382
| * | | | pass through travis errorsJack Humbert2017-02-071-1/+1
| * | | | Merge pull request #1056 from upils/masterJack Humbert2017-02-078-0/+334
| |\ \ \ \
| | * | | | Add reddot handwired keyboard.upils2017-01-318-0/+334
| * | | | | Merge pull request #1053 from TerryMathews/masterJack Humbert2017-02-0710-4/+175
| |\ \ \ \ \
| | * | | | | Reverse rev2 and rev2fliphalfTerryMathews2017-02-062-8/+8
| | * | | | | Revert "Reverse rev2 and rev2fliphalf"TerryMathews2017-02-062-7/+7
| | * | | | | Reverse rev2 and rev2fliphalfTerryMathews2017-02-062-7/+7
| | * | | | | Let's Split: establish rev2fliphalf subprojectTerryMathews2017-01-299-0/+171
| * | | | | | add commaJack Humbert2017-02-071-1/+1
| * | | | | | Merge pull request #1069 from hot-leaf-juice/masterJack Humbert2017-02-072-5/+3
| |\ \ \ \ \ \
| | * | | | | | change cmd-l and cmd-r for actual home and endCallum Oakley2017-02-062-5/+3
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #1041 from folkert4/masterJack Humbert2017-02-075-0/+503
| |\ \ \ \ \ \
| | * | | | | | Added Espynn's keymapfolkert42017-01-275-0/+503
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #1047 from lordchair/keymap_yaleJack Humbert2017-02-074-0/+144
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | added picture of layoutYale Thomas2017-01-281-0/+0
| | * | | | | usability tweaksYale Thomas2017-01-281-44/+49
| | * | | | | mouse keys addedYale Thomas2017-01-281-6/+15
| | * | | | | new 'yale' keymapYale Thomas2017-01-283-0/+130
| | |/ / / /
| * | | | | Merge pull request #1048 from smt/smt/planckJack Humbert2017-02-065-22/+385
| |\ \ \ \ \
| | * | | | | s/Bkps/BkspStephen Tudor2017-01-281-1/+1
| | * | | | | Carry over Planck updates to my Preonic keymapStephen Tudor2017-01-282-22/+50
| | * | | | | Improve Planck keymapStephen Tudor2017-01-282-11/+33
| | * | | | | Merge branch 'master' into smt/planckStephen Tudor2017-01-2821-25/+412
| | |\| | | |
| | * | | | | Add smt keymap for PlanckStephen Tudor2017-01-263-0/+313
| * | | | | | Merge pull request #1036 from nicinabox/lets-split-improvementsJack Humbert2017-02-062-0/+14
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Update readmeNic Aitch2017-01-261-0/+4
| | * | | | | Add avrdude targetNic Aitch2017-01-261-0/+10
| | |/ / / /
| * | | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-02-015-30/+900
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman2017-01-314-0/+866
| | |\ \ \ \ \
| | | * | | | | albert ergodox keymapAlbert Pretorius2017-01-264-0/+866
| | | | |_|_|/ | | | |/| | |