summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * on_each_tap_fn is called on tap down and tap upPavlos Vinieratos2016-07-191-1/+1
| * add a bit of documentationPavlos Vinieratos2016-07-191-3/+45
| * in the default case, it should be called if there is actually a tapPavlos Vinieratos2016-07-181-2/+2
| * change naming, and remove extraneous definitionPavlos Vinieratos2016-07-172-36/+23
| * add an `anyway` and a `reset` callbackPavlos Vinieratos2016-07-162-5/+59
| * in case its NULLPavlos Vinieratos2016-07-161-1/+3
|/
* Merge pull request #489 from Skrymir/masterJack Humbert2016-07-142-0/+213
|\
| * Merge pull request #2 from jackhumbert/masterJoshua Colbeck2016-07-1282-786/+2969
| |\
| * \ Merge branch 'master' of https://github.com/Skrymir/qmk_firmwareJosh Colbeck2016-07-062-0/+213
| |\ \
| | * \ Merge pull request #1 from Skrymir/patch-1Joshua Colbeck2016-07-0612-244/+495
| | |\ \
| | | * | Changed layer switching to momentaryJosh Colbeck2016-07-061-6/+6
| | | * | Merge remote-tracking branch 'jackhumbert/master' into patch-1Josh Colbeck2016-07-042-14/+14
| | | |\ \