summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* joeJack Humbert2015-02-193-9/+117
* seanJack Humbert2015-02-151-9/+9
* Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2015-02-0513-684/+314
|\
| * Merge pull request #4 from pepers/masterJack Humbert2015-01-279-556/+41
| |\
| | * defined semi-standard and short space layoutspepers2015-01-279-556/+41
| * | Merge pull request #3 from pepers/masterJack Humbert2015-01-232-15/+47
| |\|
| | * defined KEYMAP_GRID for grid layoutspepers2015-01-232-15/+47
| |/
| * Create keymap_matthew.cJack Humbert2015-01-231-0/+50
| * Create keymap_nathan.cJack Humbert2015-01-231-0/+180
| * Update README.mdJack Humbert2015-01-231-0/+2
| * Update README.mdJack Humbert2015-01-151-0/+1
| * Update README.mdJack Humbert2015-01-151-125/+5
* | subproject commit?Jack Humbert2015-01-231-0/+0
|/
* Merge remote-tracking branch 'upstream/master'Jack Humbert2015-01-1455-278/+2399
|\
| * hhkb: Add Makefile.jp for HHKB JPJun Wako2015-01-113-6/+13
| * Merge branch 'mbed_infinity'Jun Wako2015-01-0429-99/+1955
| |\
| | * infinity: Add initial files for keyboard supportJun Wako2015-01-0418-411/+1029
| | * infinity: Move project specific files to localJun Wako2015-01-047-4/+362
| | * Fix linker script for NVIC vector on RAMJun Wako2015-01-043-18/+8
| | * Add openocd config files for K20Jun Wako2015-01-042-0/+137
| | * Add keyboard/infinityJun Wako2015-01-048-56/+757
| | * Fix ps2 protocol build using ps2_io.hJun Wako2015-01-042-0/+2
| | * Update makefiles to mbed-sdk 14666bbJun Wako2015-01-044-87/+127
| | * Ad hoc fix of print and debug for mbedJun Wako2015-01-042-2/+12
| |/
| * bluefruit, pjrc: Update protocols for new APItmk2015-01-036-35/+7
| * Fix modifier stuck of Lock command(#127)tmk2015-01-011-0/+1
| * usb_usb: update READMEJun Wako2014-12-301-1/+15
| * Merge branch 'mumchristmas-Apple_media_key_fix' #160Jun Wako2014-12-262-4/+11
| |\
| | * Remove unwanted white spaceJun Wako2014-12-261-3/+3
| | * Add keycode for Fast Forward & RewindColt Ma2014-12-262-2/+9
| |/
| * [ps2,terminal_usb] Quick fix for build problemtmk2014-12-242-0/+3
| * usb_usb: Add SpaceFn and hasu keymapJun Wako2014-12-117-125/+342
| * Merge branch 'usb_usb_hub'Jun Wako2014-12-117-8/+52
| |\
| | * Update READMEJun Wako2014-12-111-3/+23
| | * Change debug print configJun Wako2014-12-111-0/+2
| | * Add USB Hub supportJun Wako2014-12-102-0/+11
| | * Add submodule legitimate USB_Host_Shield_2.0Jun Wako2014-12-102-0/+3
| | * Remove submodule USB_Host_Shield_2.0Jun Wako2014-12-102-3/+0
| | * Fix print init; print_set_sendchar in mainJun Wako2014-12-101-0/+2
| | * Change USB PIDJun Wako2014-12-103-5/+14
| |/
* | Merge branch 'planck-jack'Jack Humbert2015-01-1431-49/+2424
|\ \
| * | Create keymap_shane.cJack Humbert2015-01-141-0/+100
| * | seanJack Humbert2015-01-137-61/+92
| * | atomicJack Humbert2015-01-1216-0/+1396
| * | namesJack Humbert2015-01-123-7/+7
| * | dotcomJack Humbert2015-01-053-61/+41
| * | dotcomJack Humbert2015-01-052-0/+85
| * | Update keymap_jack.cJack Humbert2015-01-051-12/+19
| * | added planck folderJack Humbert2014-12-149-3/+798
| * | Update keymap_common.hJack Humbert2014-12-121-2/+2