summaryrefslogtreecommitdiff
path: root/keyboards
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master'Xyverz2017-04-02
|\
| * Worked around some new Makefile issues.nielsenz2017-03-30
| * changed hotkey cluster to accomodate awkward software... againCallum Oakley2017-03-30
| * changed hotkey cluster to accomodate awkward softwareCallum Oakley2017-03-30
| * Merge branch 'master' into to_pushZay9502017-03-29
| |\
| | * Merge pull request #1183 from Rovanion/real-masterJack Humbert2017-03-29
| | |\
| | | * Added link to the teensy linux page.Rovanion Luckey2017-03-29
| | | * Added instructions for how to build and flash the firmware with teensy_cli.Rovanion Luckey2017-01-24
| | * | Merge pull request #1182 from henxing/default_atreus_layoutJack Humbert2017-03-28
| | |\ \
| | | * \ Merge branch 'master' into default_atreus_layoutHugh Enxing2017-03-28
| | | |\ \
| | | * | | Swapped placement of `Ctrl` and `Alt` keys to match Technomancy'sHugh Enxing2017-03-24
| | * | | | typo removed {3 ...Ole Anders2017-03-28
| | * | | | fixed capitalization issue (checkTime => checktime)Ole Anders2017-03-28
| | * | | | moved checktime out of functionOle Anders2017-03-28
| | * | | | declaring checktime before the function it is used in.Ole Anders2017-03-28
| | * | | | fixed function to not accept any arguments.Ole Anders2017-03-28
| | * | | | removed varable trace option from makefileOle Anders2017-03-28
| | * | | | slight cleanup as per recommendationOle Anders2017-03-28
| | * | | | Moved key_timer out of function.Ole Anders2017-03-28
| | * | | | removed a carriage returnOle Anders2017-03-28
| | * | | | Merge remote-tracking branch 'refs/remotes/qmk/master'Ole Anders2017-03-28
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge pull request #1174 from nooges/atreus50Jack Humbert2017-03-28
| | | |\ \ \
| | | | * | | Move Atreus50 to hardwired directory and update READMEDanny Nguyen2017-03-28
| | | | * | | Add RGB supportDanny Nguyen2017-03-23
| | | | * | | Cleanup keymapDanny Nguyen2017-03-23
| | | | * | | Initial commit for Atreus50 with working audioDanny Nguyen2017-03-23
| | | | |/ /
| | | * | | Merge pull request #1112 from newsboytko/newsboytko/midi-keycodesJack Humbert2017-03-28
| | | |\ \ \
| | | | * | | Update size estimates in the MakefileGabriel Young2017-02-25
| | | | * | | Update existing keymapsGabriel Young2017-02-25
| | | | * | | Add basic layer to sample MIDI keycapGabriel Young2017-02-25
| | | | * | | Split MIDI functionality into MIDI_BASIC and MIDI_ADVANCEDGabriel Young2017-02-25
| | | | * | | fix typos in keymapGabriel Young2017-02-19
| | | | * | | Document size added by MIDI_ENABLE (~3800 bytes according to my experiments)Gabriel Young2017-02-19
| | | | * | | Allow customization of the number of tone keycodes and add example keymapGabriel Young2017-02-19
| | | * | | | Merge pull request #1167 from smt/smt/satanJack Humbert2017-03-28
| | | |\ \ \ \
| | | | * | | | Use single _FUNC layer. Move RESET and base layout-changing keys to _FUNC.Stephen Tudor2017-03-20
| | | | * | | | Remove tap-dance. Raise will be accessed via holding shift while lower is activeStephen Tudor2017-03-20
| | | | * | | | Use normal backtick in ESC spot - I've mapped ESC to caps lockStephen Tudor2017-03-20
| | | | * | | | Fix shift tap-dance (can't use one-shot layer)Stephen Tudor2017-03-20
| | | | * | | | Forsake spacefn in favor of left shift tapdance. Move media controls.Stephen Tudor2017-03-10
| | | | * | | | Add smt keymap for Satan 'GH60'Stephen Tudor2017-03-09
| | | * | | | | Merge pull request #1162 from Khord/masterJack Humbert2017-03-28
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' of https://github.com/Khord/qmk_firmwareDylan Khor2017-03-20
| | | | |\ \ \ \ \
| | | | | * | | | | Missing commaDylan Khor2017-03-19
| | | | | * | | | | Don't feel like tap dancing arrows anymoreDylan Khor2017-03-19
| | | | * | | | | | add pgup, pgdn, home, endDylan Khor2017-03-20
| | | | |/ / / / /
| | | | * | | | | tap dance working for esc and arrowsDylan Khor2017-03-16
| | | | * | | | | remove constDylan Khor2017-03-16
| | | | * | | | | test td changesDylan Khor2017-03-16
| | | | * | | | | test fixes for tap daneDylan Khor2017-03-16