Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into coderkun_neo2 | coderkun | 2017-04-01 | 448 | -2598/+26659 |
|\ | |||||
| * | Worked around some new Makefile issues. | nielsenz | 2017-03-30 | 6 | -55/+55 |
| * | changed hotkey cluster to accomodate awkward software... again | Callum Oakley | 2017-03-30 | 1 | -1/+1 |
| * | changed hotkey cluster to accomodate awkward software | Callum Oakley | 2017-03-30 | 1 | -7/+7 |
| * | Merge branch 'master' into to_push | Zay950 | 2017-03-29 | 596 | -2652/+55289 |
| |\ | |||||
| | * | Merge pull request #1183 from Rovanion/real-master | Jack Humbert | 2017-03-29 | 1 | -4/+17 |
| | |\ | |||||
| | | * | Added link to the teensy linux page. | Rovanion Luckey | 2017-03-29 | 1 | -2/+5 |
| | | * | Added instructions for how to build and flash the firmware with teensy_cli. | Rovanion Luckey | 2017-01-24 | 1 | -4/+14 |
| | * | | Merge pull request #1182 from henxing/default_atreus_layout | Jack Humbert | 2017-03-28 | 1 | -6/+6 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' into default_atreus_layout | Hugh Enxing | 2017-03-28 | 76 | -209/+3960 |
| | | |\ \ | |||||
| | | * | | | Swapped placement of `Ctrl` and `Alt` keys to match Technomancy's | Hugh Enxing | 2017-03-24 | 1 | -6/+6 |
| | * | | | | typo removed {3 ... | Ole Anders | 2017-03-28 | 1 | -3/+2 |
| | * | | | | fixed capitalization issue (checkTime => checktime) | Ole Anders | 2017-03-28 | 1 | -2/+4 |
| | * | | | | moved checktime out of function | Ole Anders | 2017-03-28 | 1 | -6/+3 |
| | * | | | | declaring checktime before the function it is used in. | Ole Anders | 2017-03-28 | 1 | -0/+1 |
| | * | | | | fixed function to not accept any arguments. | Ole Anders | 2017-03-28 | 1 | -1/+1 |
| | * | | | | removed varable trace option from makefile | Ole Anders | 2017-03-28 | 1 | -1/+0 |
| | * | | | | slight cleanup as per recommendation | Ole Anders | 2017-03-28 | 1 | -1/+2 |
| | * | | | | Moved key_timer out of function. | Ole Anders | 2017-03-28 | 1 | -3/+4 |
| | * | | | | removed a carriage return | Ole Anders | 2017-03-28 | 1 | -19/+18 |
| | * | | | | Merge remote-tracking branch 'refs/remotes/qmk/master' | Ole Anders | 2017-03-28 | 276 | -2293/+14170 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Merge pull request #1174 from nooges/atreus50 | Jack Humbert | 2017-03-28 | 8 | -0/+565 |
| | | |\ \ \ | |||||
| | | | * | | | Move Atreus50 to hardwired directory and update README | Danny Nguyen | 2017-03-28 | 9 | -25/+16 |
| | | | * | | | Add RGB support | Danny Nguyen | 2017-03-23 | 3 | -4/+4 |
| | | | * | | | Cleanup keymap | Danny Nguyen | 2017-03-23 | 3 | -115/+94 |
| | | | * | | | Initial commit for Atreus50 with working audio | Danny Nguyen | 2017-03-23 | 9 | -0/+595 |
| | | | |/ / | |||||
| | | * | | | Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes | Jack Humbert | 2017-03-28 | 20 | -0/+574 |
| | | |\ \ \ | |||||
| | | | * | | | Update size estimates in the Makefile | Gabriel Young | 2017-02-25 | 1 | -1/+1 |
| | | | * | | | Update existing keymaps | Gabriel Young | 2017-02-25 | 17 | -0/+449 |
| | | | * | | | Add basic layer to sample MIDI keycap | Gabriel Young | 2017-02-25 | 1 | -1/+22 |
| | | | * | | | Split MIDI functionality into MIDI_BASIC and MIDI_ADVANCED | Gabriel Young | 2017-02-25 | 2 | -3/+18 |
| | | | * | | | fix typos in keymap | Gabriel Young | 2017-02-19 | 1 | -8/+2 |
| | | | * | | | Document size added by MIDI_ENABLE (~3800 bytes according to my experiments) | Gabriel Young | 2017-02-19 | 3 | -2/+4 |
| | | | * | | | Allow customization of the number of tone keycodes and add example keymap | Gabriel Young | 2017-02-19 | 4 | -0/+93 |
| | | * | | | | Merge pull request #1167 from smt/smt/satan | Jack Humbert | 2017-03-28 | 3 | -0/+163 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Use single _FUNC layer. Move RESET and base layout-changing keys to _FUNC. | Stephen Tudor | 2017-03-20 | 1 | -43/+12 |
| | | | * | | | | Remove tap-dance. Raise will be accessed via holding shift while lower is active | Stephen Tudor | 2017-03-20 | 2 | -22/+11 |
| | | | * | | | | Use normal backtick in ESC spot - I've mapped ESC to caps lock | Stephen Tudor | 2017-03-20 | 1 | -4/+4 |
| | | | * | | | | Fix shift tap-dance (can't use one-shot layer) | Stephen Tudor | 2017-03-20 | 2 | -34/+12 |
| | | | * | | | | Forsake spacefn in favor of left shift tapdance. Move media controls. | Stephen Tudor | 2017-03-10 | 1 | -24/+25 |
| | | | * | | | | Add smt keymap for Satan 'GH60' | Stephen Tudor | 2017-03-09 | 3 | -0/+226 |
| | | * | | | | | Merge pull request #1162 from Khord/master | Jack Humbert | 2017-03-28 | 3 | -0/+433 |
| | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ | Merge branch 'master' of https://github.com/Khord/qmk_firmware | Dylan Khor | 2017-03-20 | 1 | -4/+4 |
| | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | Missing comma | Dylan Khor | 2017-03-19 | 1 | -1/+1 |
| | | | | * | | | | | Don't feel like tap dancing arrows anymore | Dylan Khor | 2017-03-19 | 1 | -4/+4 |
| | | | * | | | | | | add pgup, pgdn, home, end | Dylan Khor | 2017-03-20 | 1 | -4/+4 |
| | | | |/ / / / / | |||||
| | | | * | | | | | tap dance working for esc and arrows | Dylan Khor | 2017-03-16 | 1 | -7/+15 |
| | | | * | | | | | remove const | Dylan Khor | 2017-03-16 | 1 | -1/+1 |
| | | | * | | | | | test td changes | Dylan Khor | 2017-03-16 | 2 | -7/+6 |
| | | | * | | | | | test fixes for tap dane | Dylan Khor | 2017-03-16 | 2 | -12/+11 |