summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-1256-747/+1343
|\
| * Merge pull request #477 from Smilliam/masterJack Humbert2016-07-113-1/+19
| |\
| | * amended extraneous file editsSmilliam2016-07-102-7/+1
| | * Made rollover behavior for space cadet optionalSmilliam2016-07-104-10/+26
| | * fixed indentation.Smilliam2016-07-041-8/+8
| | * Allow Space Cadet state to be canceled by alternate Shift keySmilliam2016-07-041-0/+8
| * | Merge pull request #506 from stanleylai/masterJack Humbert2016-07-112-0/+104
| |\ \
| | * | Added my custom keymap for SatanStanley Lai2016-07-102-0/+104
| * | | Merge pull request #507 from ruiqimao/masterskullydazed2016-07-114-17/+33
| |\ \ \ | | |/ / | |/| |
| | * | fixed clueboard LED pin assignments and matrix documentationRuiqi Mao2016-07-114-17/+33
| |/ /
| * | Merge pull request #505 from fredizzimo/documentation_fixJack Humbert2016-07-101-3/+0
| |\ \
| | * | Remove out of place documentation, caused by ChibiOS mergeFred Sundvik2016-07-101-3/+0
| * | | Merge pull request #502 from robotmaxtron/masterJack Humbert2016-07-095-0/+544
| |\ \ \
| | * | | Update keymap.cMax Whittingham2016-07-091-3/+1
| | * | | Cleaning up repoMax Whittingham2016-07-095-0/+546
| |/ / /
| * | | Merge pull request #500 from TerryMathews/masterJack Humbert2016-07-091-0/+116
| |\ \ \
| | * \ \ Merge pull request #1 from jackhumbert/masterTerryMathews2016-07-0910-47/+267
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Documents tap danceErez Zukerman2016-07-081-0/+75
| | |/ / | |/| |
| * | | Merge pull request #498 from fredizzimo/fix_make_dependenciesJack Humbert2016-07-081-10/+12
| |\ \ \
| | * | | Use order only prerequisites to avoid re-linkingFred Sundvik2016-07-081-9/+11
| | * | | Fix name of makefile dep filesFred Sundvik2016-07-081-1/+1
| |/ / /
| * | | Merge pull request #496 from fredizzimo/makefile_optimizationJack Humbert2016-07-082-39/+22
| |\ \ \
| | * | | Fix the link targetFred Sundvik2016-07-081-1/+1
| | * | | Don't run git describe for ever file that is builtFred Sundvik2016-07-081-1/+1
| | * | | Speed up compilation by not using recusive makeFred Sundvik2016-07-081-38/+21
| * | | | Merge pull request #494 from robbiegill/masterJack Humbert2016-07-087-1/+161
| |\ \ \ \
| | * | | | port missing support for hhkb-jp from tmkRobbie Gill2016-07-077-1/+161
| * | | | | Merge pull request #493 from TerryMathews/masterJack Humbert2016-07-0812-595/+92
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | | | * | Establish Poker clone keymap for SatanTerryMathews2016-07-091-0/+116
| | | |/ / | | |/| |
| | * | | Fix a function mismatch that was causing LEDs to not properly initializeTerryMathews2016-07-081-1/+1
| | * | | Move return out of event if blockTerryMathews2016-07-081-26/+26
| | * | | Fix cluepad and planckTerryMathews2016-07-072-5/+5
| | * | | Fix compile error on ClueboardTerryMathews2016-07-071-2/+2
| | * | | Create keycodes for RGB control functionsTerryMathews2016-07-0711-586/+83
| |/ / /
| * | | Merge pull request #491 from fredizzimo/keycode_fixesJack Humbert2016-07-074-9/+7
| |\ \ \
| | * | | Fix IS_CONSUMER macroFred Sundvik2016-07-071-1/+1
| | * | | Remove unhandled KC_BTLD, RESET should be used insteadFred Sundvik2016-07-073-7/+5
| | * | | Fix the range for consumer keysFred Sundvik2016-07-071-1/+1
| |/ / /
| * | | fixes quantum template (actually)Jack Humbert2016-07-071-1/+1
| * | | updates rgblight implementation, makes non-timer stuff compatible with audioJack Humbert2016-07-0717-74/+160
* | | | I did not like Space Cadet paren; it jumps in in way too many extra casesChristopher Browne2016-07-121-1/+1
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-07145-183/+9398
|\| | |
| * | | Merge pull request #490 from fredizzimo/integrate_visualizerJack Humbert2016-07-0726-39/+1626
| |\ \ \
| | * | | Move the visualizer_user file to keymap folderFred Sundvik2016-07-072-3/+8
| | * | | Delete lcd_backlight_hal.cFred Sundvik2016-07-073-87/+65
| | * | | Add suspend support to the ChibiOS visualizerFred Sundvik2016-07-071-0/+7
| | * | | Fix the SERIAL_LINK_ENABLE macro in VisualizerFred Sundvik2016-07-071-5/+5
| | * | | Fix visualizer crash at startupFred Sundvik2016-07-073-6/+5
| | * | | Makefile fixes and update of VisualizerFred Sundvik2016-07-075-7/+29
| | * | | Add Infinity Ergodox display driversFred Sundvik2016-07-0713-0/+992