summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1396 from shieldsd/masterJack Humbert2017-06-152-25/+15
|\
| * Minor updates to planck/keymaps/dshieldsDaniel Shields2017-06-152-25/+15
|/
* Added HyperTab and Ctrl/Fn as well as Space cadet parens (#1390)Martin Gondermann2017-06-144-42/+79
* Update uGFX and Chibios submodules + fixes (#1363)fredizzimo2017-06-133-3/+3
* Merge pull request #1392 from jetpacktuxedo/whitefoxJack Humbert2017-06-132-0/+63
|\
| * Added whitefox keymapEthan Madden2017-06-132-0/+63
|/
* Merge pull request #1387 from antelaurijssen/masterJack Humbert2017-06-124-0/+908
|\
| * Properly formatted unordered lists in readme.mdAnte Laurijssen2017-06-121-29/+29
| * Mods to readme.mdAnte Laurijssen2017-06-121-1/+1
| * Modifications to readme.md and deletion of keyboard layout imagesAnte Laurijssen2017-06-128-5214/+16
| * -MIDI Chords now using process_record_user instead of F(n) keysAnte Laurijssen2017-06-111-328/+164
| * Created special shift keys for Morse layer that change variable value, enabli...Ante Laurijssen2017-06-071-143/+29
| * Working on Morse Code MacrosAnte Laurijssen2017-06-071-9/+24
| * Added a couple of custom keys and updated layer imageAnte Laurijssen2017-06-052-7/+36
| * Improvements and corrections to morse code macros layerAnte Laurijssen2017-06-021-44/+44
| * Improvements to Midi and keymapAnte Laurijssen2017-05-301-57/+57
| * Another typo...Ante Laurijssen2017-05-291-1/+1
| * Corrected typo in readme.mdAnte Laurijssen2017-05-291-2/+2
| * Added a few imagesAnte Laurijssen2017-05-293-0/+5190
| * Added MIDI_CHORD layer and other little fixes.Ante Laurijssen2017-05-295-29/+226
| * Midi Chord Function is now working! But some chords lag...Ante Laurijssen2017-05-282-46/+124
| * Still working on these MIDI CHORDS!Ante Laurijssen2017-05-262-26/+11
| * More changes to keymap.c to try and get midi chords to workAnte Laurijssen2017-05-251-74/+86
| * More updates to keymap.c - still errors with midi when trying to compileAnte Laurijssen2017-05-241-71/+61
| * More work on my keymap.c and added .png images of my different layers.Ante Laurijssen2017-05-226-99/+120
| * More work on keymap.c and config.hAnte Laurijssen2017-05-212-104/+197
| * Merge https://github.com/qmk/qmk_firmwareAnte Laurijssen2017-05-2112-35/+377
| |\
| * | Continuing work on keymap.cAnte Laurijssen2017-05-211-34/+416
| * | Merge https://github.com/qmk/qmk_firmwareAnte Laurijssen2017-05-178-39/+69
| |\ \
| * | | Added Space Cadet Rollover Disable to config.hAnte Laurijssen2017-05-161-0/+3
| * | | Working on keymap.c file...Ante Laurijssen2017-05-151-4/+6
| * | | Started working on custom midi chord functionAnte Laurijssen2017-05-141-0/+68
| * | | Initial push of my keymapAnte Laurijssen2017-05-144-0/+319
* | | | Merge pull request #1389 from geofflane/keyboard_s65_x_2Jack Humbert2017-06-126-30/+297
|\ \ \ \
| * | | | Add ISO layout for S65-XGeoff Lane2017-06-123-0/+267
| * | | | Fix media controls in default layoutGeoff Lane2017-06-121-2/+2
| * | | | Fix backslash and some of the docsGeoff Lane2017-06-124-28/+28
* | | | | Merge pull request #1388 from bigbigtor/fix_spanishJack Humbert2017-06-121-3/+3
|\ \ \ \ \
| * | | | | Rename ES_RCRB to ES_RCBR for consistency reasons (left curly bracket is defi...Víctor2017-06-121-1/+1
| * | | | | Fix keymap definitions referencing inexistent macrosVíctor2017-06-121-2/+2
|/ / / / /
* / / / / Add MIDI layer to magicmonty keymap (#1386)Martin Gondermann2017-06-124-29/+105
|/ / / /
* | | | Merge pull request #1385 from qmk/ez-imagesJack Humbert2017-06-11199-2386/+142
|\ \ \ \
| * | | | remove .hex, .PNG, .jpgJack Humbert2017-06-1157-24/+42
| * | | | remove the rest of the .pngsJack Humbert2017-06-1158-35/+44
| * | | | remove most .pngsJack Humbert2017-06-1188-2327/+56
* | | | | define limits to functionsJack Humbert2017-06-111-0/+4
|/ / / /
* | | | Merge pull request #1384 from geofflane/keyboard_s65xJack Humbert2017-06-108-0/+511
|\ \ \ \
| * | | | Support Sentraq S65-XGeoff Lane2017-06-108-0/+511
|/ / / /
* | | | Merge pull request #1383 from qmk/deleting-filesJack Humbert2017-06-1017-2626/+0
|\ \ \ \
| * | | | Delete VAGRANT_GUIDE.mdJack Humbert2017-06-101-27/+0