summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #542 from algernon/f/hold-the-danceErez Zukerman2016-07-243-96/+87
|\
| * readme.md: Update the tap dance docsGergely Nagy2016-07-221-12/+15
| * readme.md: algernon is strictly lowercaseGergely Nagy2016-07-221-1/+1
| * tap-dance: Code cleanupGergely Nagy2016-07-221-21/+24
| * tap-dance: Support user_data for the callbacksGergely Nagy2016-07-222-64/+38
| * tap-dance: Support for holding keysGergely Nagy2016-07-222-1/+12
* | Merge pull request #535 from algernon/ergodox-ez/algernonErez Zukerman2016-07-249-214/+855
|\ \ | |/ |/|
| * ergodox_ez: Update my keymap to v1.3Gergely Nagy2016-07-189-214/+855
* | Merge pull request #543 from VoodaGod/bone2planckJack Humbert2016-07-211-74/+120
|\ \
| * | fixed include pathsJason Janse van Rensburg2016-07-201-16/+16
| * | reformatJason Janse van Rensburg2016-07-201-16/+16
| * | updated bone2planckJason Janse van Rensburg2016-07-201-65/+111
| |/
* | Merge pull request #541 from milestogo/masterJack Humbert2016-07-2129-0/+2816
|\ \
| * | adding traveller keyboardmilestogo2016-07-207-0/+697
| * | initial kinisis advantage buildmilestogo2016-07-1922-0/+2119
| |/
* | Merge pull request #540 from replicaJunction/feature-atreus-keymapFunctionJack Humbert2016-07-211-5/+5
|\ \
| * | Adjusted Atreus KEYMAP() function.Joshua T2016-07-191-5/+5
| |/
* | Merge pull request #538 from robertdale/preonic-map-correctionJack Humbert2016-07-211-5/+5
|\ \
| * | added Midi On/Off; Enter is actually transparentRobert Dale2016-07-191-3/+3
| * | Corrected the ascii layout to match the coded layoutRobert Dale2016-07-191-3/+3
| |/
* | Merge pull request #536 from pvinis/debug-docJack Humbert2016-07-211-1/+1
|\ \
| * | add link to hid_listenPavlos Vinieratos2016-07-191-1/+1
| * | add some debugging doc, after i found out how to print debug messagesPavlos Vinieratos2016-07-191-1/+1
| |/
* | Merge pull request #530 from sethbc/masterJack Humbert2016-07-2110-8/+53
|\ \
| * | don't believe the hex files are posted to qmk.fmSeth Chandler2016-07-171-1/+1
| * | update more non-existent readmes for QMK.fmSeth Chandler2016-07-174-0/+16
| * | update broken linkSeth Chandler2016-07-171-1/+1
| * | update audio linksSeth Chandler2016-07-171-1/+1
| * | update tmk linkSeth Chandler2016-07-171-1/+1
| * | update link to Vagrant docfileSeth Chandler2016-07-171-1/+1
| * | update readmes in certain directories to work with qmk.fmSeth Chandler2016-07-172-0/+8
| * | add custom makefile for sethbc keymapSeth Chandler2016-07-161-0/+21
| * | update makefile to default to no virtual dip switchesSeth Chandler2016-07-161-1/+1
| * | update readme imagesSeth Chandler2016-07-161-2/+2
| |/
* | Merge pull request #529 from CommandLineDesign/CMD60-newKeymapJack Humbert2016-07-216-0/+364
|\ \
| * | Fix erroneous characterJonathan Lucas2016-07-161-1/+1
| * | Added CMD60 keymapJonathan Lucas2016-07-166-0/+364
| |/
* | Merge pull request #525 from edasque/masterJack Humbert2016-07-212-0/+43
|\ \
| * | Further simplyfying the docker usageErik Dasque2016-07-151-7/+3
| * | Adding Docker build system & documentationErik Dasque2016-07-152-0/+47
| |/
* | Merge pull request #522 from exiva/extrakey-macfixJack Humbert2016-07-211-2/+2
|\ \
| * | Fix OS X Recognizing keyboard as Mouse/TabletTravis La Marr2016-07-151-2/+2
| |/
* | Merge pull request #521 from exiva/makefile-waitJack Humbert2016-07-211-0/+4
|\ \
| * | Make DFU wait for bootloaderTravis La Marr2016-07-151-0/+4
| |/
* | Merge pull request #518 from jakllsch/upstreamJack Humbert2016-07-218-13/+20
|\ \
| * | keymap_dvorak.h: add missing shifted keys, fix whitespaceJonathan A. Kollasch2016-07-141-4/+11
| * | extra_keymaps: use RALT() instead of 0x1400 for AltGrJonathan A. Kollasch2016-07-147-7/+7
| * | keymap_extras: add newline at end of filesJonathan A. Kollasch2016-07-142-2/+2
| |/
* | Merge pull request #516 from pvinis/tap-dance-anywayJack Humbert2016-07-213-16/+103
|\ \ | |/ |/|
| * add a couple of commentsPavlos Vinieratos2016-07-191-0/+2