summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Merge pull request #151 from bswinnerton/typo-fixtmk2015-01-191-6/+6
| |\ \ \
| | * | | Fixing typo in console modeBrooks Swinnerton2014-11-301-6/+6
| * | | | Merge branch 'vovcacik-ghost_squid'tmk2015-01-198-0/+605
| |\ \ \ \
| | * | | | Merge branch 'ghost_squid' of https://github.com/vovcacik/tmk_keyboard into v...tmk2015-01-198-0/+605
| |/| | | |
| | * | | | Added support for The Ghost Squid controller used for CM XT keyboard.Vlastimil Ovčáčík2014-12-288-0/+605
| * | | | | Merge pull request #164 from cub-uanic/patch-2tmk2015-01-191-0/+1
| |\ \ \ \ \
| | * | | | | Update other_projects.md - added TMK/ErgodoxOleg Kostyuk2015-01-031-0/+1
| * | | | | | Fix typo 'keyobard' #166tmk2015-01-193-3/+3
| * | | | | | Merge branch 'xauser-forhasu'tmk2015-01-1911-0/+753
| |\ \ \ \ \ \
| | * | | | | | Revert "Changed hotkey for bootloader jump"tmk2015-01-191-1/+1
| | * | | | | | Merge branch 'forhasu' of https://github.com/xauser/tmk_keyboard into xauser-...tmk2015-01-1912-1/+754
| |/| | | | | |
| | * | | | | | Added missing keyboards to main READMERalf Schmitt2015-01-181-0/+2
| | * | | | | | Added NerD 80% (TKL) supportRalf Schmitt2015-01-1810-111/+149
| | * | | | | | Added NerD 60% supportRalf Schmitt2015-01-1811-0/+713
| | * | | | | | Changed hotkey for bootloader jumpRalf Schmitt2015-01-181-1/+1
| * | | | | | | hhkb: Update RN-42 docstmk2015-01-192-8/+66
| |/ / / / / /
| * | | | | | Merge branch 'rn42_integrate'tmk2015-01-1632-1047/+73
| |\ \ \ \ \ \
| | * | | | | | hhkb: Integrate RN-42 support, remove hhkb_rn42tmk2015-01-1632-1004/+69
| | * | | | | | hhkb_rn42: Move doctmk2015-01-161-43/+4
| |/ / / / / /
| * | | | | | hhkb: Fix layer stuck of keymap_hasutmk2015-01-161-16/+18
| * | | | | | Merge branch 'rn42'tmk2015-01-1515-692/+1027
| |\ \ \ \ \ \
| | * | | | | | rn42: Update doctmk2015-01-152-35/+404
| | * | | | | | Use pgmspace for RN-42 commandstmk2015-01-151-33/+137
| | * | | | | | Increase buffer of rn42_gets() and change rn42_linked()tmk2015-01-152-6/+6
| | * | | | | | rn42: Add commands for RN-42tmk2015-01-151-81/+153
| | * | | | | | rn42: Add rn42_getc and rn42_getstmk2015-01-152-0/+32
| | * | | | | | Fxi layer stuck of keymap_hasutmk2015-01-151-12/+12
| | * | | | | | Update doctmk2015-01-152-451/+128
| | * | | | | | Change RN42 state displaytmk2015-01-151-18/+24
| | * | | | | | Fix power saving while USB suspendedtmk2015-01-154-15/+27
| | * | | | | | Add wait for charging capacitance of ADC S/Htmk2015-01-151-0/+1
| | * | | | | | Fix: enable digital input for PF5tmk2015-01-151-1/+1
| | * | | | | | Clean ADC code of battery_voltage()tmk2015-01-151-13/+2
| | * | | | | | Disable input buffer for ADCtmk2015-01-151-0/+4
| | * | | | | | Update MEMOtmk2015-01-151-2/+56
| | * | | | | | Add LUFA device state to command infotmk2015-01-151-0/+2