summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* moved oneshot cancellation code outside of process_record.SjB2017-01-291-8/+8
* oneshot timeout would only timeout after an event.SjB2017-01-151-7/+7
* Merge pull request #987 from belak/belak/whitefox-initial-supportJack Humbert2017-01-1515-1/+1460
|\
| * Wait for two ticks rather than 1Kaleb Elwert2017-01-101-1/+1
| * Fix mismatched indentationKaleb Elwert2017-01-091-1/+1
| * Update clock frequencies to match the infinity ergodoxKaleb Elwert2017-01-091-15/+4
| * Increase tick frequency for responsivenessKaleb Elwert2017-01-092-2/+2
| * Remove KC_ prefix from KEYMAP macro to match other keyboardsKaleb Elwert2017-01-093-35/+35
| * Fix unrelated spelling errorKaleb Elwert2017-01-041-1/+1
| * Add white fox to keyboards readmeKaleb Elwert2017-01-041-0/+1
| * Add whitefox readmeKaleb Elwert2017-01-041-0/+7
| * Remove unneeded defineKaleb Elwert2017-01-041-1/+0
| * Initial whitefox supportKaleb Elwert2017-01-0313-0/+1463
* | Merge pull request #996 from milestogo/masterJack Humbert2017-01-1537-303/+765
|\ \
| * | removing old programmer layout, in favor of milestogomilestogo2017-01-084-276/+0
| * | trying to clean up duplicate docsmilestogo2017-01-088-1001/+0
| * | kinesis remapmilestogo2017-01-0845-266/+2005
* | | Merge pull request #999 from deadcyclo/masterJack Humbert2017-01-155-0/+26
|\ \ \
| * | | Fixed incorrect layer image in deadcyclo readmeBrendan Johan Lee2017-01-101-1/+1
| * | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-1024-35/+2265
| |\| |
| * | | Added layer images to deadcyclo layout readmeBrendan Johan Lee2017-01-105-0/+26
* | | | Merge pull request #1003 from mneme/masterJack Humbert2017-01-158-0/+519
|\ \ \ \
| * | | | Update makefile.David Olsson2017-01-122-5/+4
| * | | | - Change docs to match keymap.David Olsson2017-01-123-21/+50
| * | | | Remove comments and change to correct KN_PLUS instead of KC_PLUS.David Olsson2017-01-121-4/+4
| * | | | Link fix in readme.David Olsson2017-01-111-2/+2
| * | | | Readme + minor change to make it match reality.David Olsson2017-01-115-14/+60
| * | | | Atreus62 first semi-final draftDavid Olsson2017-01-115-0/+445
| | |/ / | |/| |
* | | | Merge pull request #1005 from kd0kkv/patch-1Jack Humbert2017-01-151-1/+1
|\ \ \ \
| * | | | Update keymap.ckd0kkv2017-01-131-1/+1
| |/ / /
* | | | Merge pull request #1006 from Vifon/masterJack Humbert2017-01-153-6/+8
|\ \ \ \
| * | | | Update the vifon keymapWojciech Siewierski2017-01-133-6/+8
| |/ / /
* | | | Merge pull request #1007 from bryan4887/bryanJack Humbert2017-01-151-0/+226
|\ \ \ \
| * | | | Added Bryan's keymapBryan Hernandez2017-01-131-0/+226
* | | | | Merge pull request #1009 from getclacking/masterJack Humbert2017-01-151-1/+1
|\ \ \ \ \
| * | | | | Typo fixJason Milkins2017-01-151-1/+1
|/ / / / /
* | | | | Merge pull request #1004 from jackhumbert/hf/scmdErez Zukerman2017-01-131-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update quantum_keycodes.hJack Humbert2017-01-131-2/+2
| * | | | A shot at aliasingErez Zukerman2017-01-121-0/+2
| * | | | Adds SCMD and SCMD_TErez Zukerman2017-01-111-0/+2
|/ / / /
* | | | Merge pull request #994 from priyadi/unicode_mods_fixJack Humbert2017-01-081-8/+33
|\ \ \ \
| * | | | Unregister all mods before inputting Unicode, and reregister afterwardsPriyadi Iman Nurcahyo2017-01-091-8/+33
* | | | | Merge pull request #993 from priyadi/greek_layerJack Humbert2017-01-082-5/+193
|\ \ \ \ \
| * | | | | Greek alphabet layerPriyadi Iman Nurcahyo2017-01-091-4/+183
| * | | | | Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethiumPriyadi Iman Nurcahyo2017-01-090-0/+0
| |\ \ \ \ \
| | * | | | | om telolet omPriyadi Iman Nurcahyo2017-01-082-1/+10
| * | | | | | om telolet omPriyadi Iman Nurcahyo2017-01-082-1/+10
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #990 from replicaJunction/masterJack Humbert2017-01-0812-22/+536
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Removed build.batJoshua T2017-01-071-51/+0
| * | | | | Merged from upstreamJoshua T2017-01-07336-3127/+39980
| |\ \ \ \ \ | |/ / / / / |/| | | | |