summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'cr34732015-05-27133-2154/+6483
|\
| * layouts, defaultJack Humbert2015-05-212-1/+51
| * default w/qwertyJack Humbert2015-05-191-0/+50
| * filesJack Humbert2015-05-183-0/+282
| * quarkJack Humbert2015-05-1514-764/+121
| * backlight stuffJack Humbert2015-05-078-17/+67
| * quarkJack Humbert2015-05-0229-0/+2481
| * Merge pull request #14 from rswiernik/masterJack Humbert2015-04-2915-11/+11
| |\
| | * Corrected makefile common varReed Swiernik2015-04-291-1/+1
| | * Moved keymap file location and fixed bugs in keymap_reed.cReed Swiernik2015-04-2915-10/+10
| * | Merge pull request #13 from rswiernik/masterJack Humbert2015-04-253-20/+117
| |\|
| | * Update README.mdReed Swiernik2015-04-251-3/+0
| | * Update README.mdReed Swiernik2015-04-251-12/+8
| | * Update README.mdReed Swiernik2015-04-251-2/+2
| | * Update README.mdReed Swiernik2015-04-251-8/+8
| | * Update README.mdReed Swiernik2015-04-251-0/+2
| | * Updated readme with new build infoReed Swiernik2015-04-251-5/+26
| | * Changed del key and added docsReed Swiernik2015-04-251-3/+9
| | * Updated makefile to properly handle non extended keymapsReed Swiernik2015-04-252-11/+20
| | * Added keymap w/ game modeReed Swiernik2015-04-251-0/+60
| | * updated makefileReed Swiernik2015-04-251-9/+15
| |/
| * Merge pull request #10 from huntse/pull_reqJack Humbert2015-04-021-19/+26
| |\
| | * Latest custom map with lower + raiseSean Hunter2015-04-021-19/+26
| |/
| * macrosJack Humbert2015-03-231-0/+1
| * macrosJack Humbert2015-03-233-6/+57
| * Update README.mdJack Humbert2015-03-211-1/+4
| * Merge pull request #9 from tmk/masterJack Humbert2015-03-2110-246/+347
| |\
| | * m0110: Fix MakefileJun Wako2015-03-191-1/+1
| | * m0110: Fix README.md and keymap_intl.cJun Wako2015-03-192-6/+6
| | * m0110: Add support for international keyboardJun Wako2015-03-1910-244/+345
| * | updated readmeJack Humbert2015-03-211-11/+21
| * | colemak shortcutsJack Humbert2015-03-213-16/+57
| * | function stuff tooJack Humbert2015-03-203-4/+18
| * | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2015-03-200-0/+0
| |\ \
| | * | Create keymap_tim.cJack Humbert2015-03-191-0/+44
| * | | working extended keymapJack Humbert2015-03-208-6/+542
| |/ /
| * | Merge pull request #8 from nathanrosspowell/masterJack Humbert2015-03-192-38/+33
| |\ \
| | * | Update keymap_nathan.cNathan Ross Powell2015-03-182-38/+33
| | * | Delete .keymap_nathan.c.swpNathan Ross Powell2015-03-181-0/+0
| | * | Merge remote-tracking branch 'upstream/master'Nathan Ross Powell2015-03-18141-2084/+7573
| | |\ \ | | |/ / | |/| |
| * | | Update README.mdJack Humbert2015-03-181-0/+5
| * | | Merge pull request #6 from tmk/masterJack Humbert2015-03-1664-1783/+2604
| |\ \ \ | | | |/ | | |/|
| | * | infinity: For production model and add SpaceFnJun Wako2015-03-054-5/+37
| | * | Fix call parameter of suspend_power_down()Jun Wako2015-01-262-2/+2
| | * | Merge pull request #176 from xauser/forhasutmk2015-01-253-5/+5
| | |\ \
| | | * | Kitten Paw, fix main README link to project.Ralf Schmitt2015-01-211-1/+1
| | | * | NerD, turn BRK into PAUS to get bootloader jump back.Ralf Schmitt2015-01-212-4/+4
| | |/ /
| | * | Add external projects using tmk_keyboardtmk2015-01-191-1/+10
| | * | Merge pull request #148 from cub-uanic/patch-1tmk2015-01-191-1/+1
| | |\ \
| | | * | Documentation: small mistakeOleg Kostyuk2014-11-201-1/+1