summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-07-06Merge branch 'master' of https://github.com/Skrymir/qmk_firmwareJosh Colbeck
2016-07-06Merge pull request #484 from jackhumbert/lets-split-supportJack Humbert
2016-07-06default keymap, reset sorted out for now, added serial to makefileJack Humbert
2016-07-06Merge pull request #1 from Skrymir/patch-1Joshua Colbeck
2016-07-06Changed layer switching to momentaryJosh Colbeck
2016-07-06Merge branch 'master' into lets-split-supportJack Humbert
2016-07-06Merge pull request #488 from fredizzimo/add_visualizerJack Humbert
2016-07-06Merge commit '73d890a2c9c34b905cd5e74e7146fdd4578dcb96' into add_visualizerFred Sundvik
2016-07-06Delete .gitmodules from visualizerFred Sundvik
2016-07-06Add 'quantum/visualizer/' from commit 'bde869aa7ec8601459bc63b9636081d21108d1be'Fred Sundvik
2016-07-06Merge pull request #487 from fredizzimo/serial_link_ergodoxJack Humbert
2016-07-06Add setting of the master side to the makefileFred Sundvik
2016-07-06Enable serial_link support for ChibiOSFred Sundvik
2016-07-06Add serial_link compilation to Infinity ErgodoxFred Sundvik
2016-07-06adds eep, removes usbconfig.hJack Humbert
2016-07-06Merge pull request #482 from fredizzimo/serial_linkJack Humbert
2016-07-06Remove extra serial_link subdirectoryFred Sundvik
2016-07-06Remove CGreen make filesFred Sundvik
2016-07-06Remove serial_link .gitignore and .gitmodulesFred Sundvik
2016-07-06fix/annotate wait_us linesJack Humbert
2016-07-05remove uno_slave for now, even though it's freakin coolJack Humbert
2016-07-05add options to config.hJack Humbert
2016-07-05Merge branch 'master' into lets-split-supportJack Humbert
2016-07-05images, docks, clean-up [skip ci]Jack Humbert
2016-07-05i2c workingJack Humbert
2016-07-05one half workingJack Humbert
2016-07-05Add 'quantum/serial_link/' from commit 'a20d513e3cdacbf6e0e70a80402497ad10166...Fred Sundvik
2016-07-05Merge pull request #480 from fredizzimo/add_infinity_ergodoxJack Humbert
2016-07-05Add dfu-util command for programmingFred Sundvik
2016-07-05Merge pull request #471 from Chipairon/patch-1Jack Humbert
2016-07-05Merge pull request #478 from fredizzimo/chibios_subprojectsJack Humbert
2016-07-05Infinity Ergodox - Add matrix.c and led.cFred Sundvik
2016-07-05First version of Infinity ErgodoxFred Sundvik
2016-07-05Fix typo in teensy_lc_onkey.hFred Sundvik
2016-07-05Don't include common_config.h for ChibiOS testFred Sundvik
2016-07-05Move ChibiOS test board and ldFred Sundvik
2016-07-05Suprojects for ChibiOS testingFred Sundvik
2016-07-04Merge remote-tracking branch 'jackhumbert/master' into patch-1Josh Colbeck
2016-07-04correct break/return order for planck and preonic defaultsJack Humbert
2016-07-04Merge remote-tracking branch 'jackhumbert/master' into patch-1Josh Colbeck
2016-07-04Added macro and readmeJosh Colbeck
2016-07-04Added new keymapJosh Colbeck
2016-07-04Fixes typos in keycode.txtJack Humbert
2016-07-04Adds wait to i2c (debounce)Jack Humbert
2016-07-04Improves debounceJack Humbert
2016-07-04fix typosPavlos Vinieratos
2016-07-04reverts #343 for the most part (#474)Jack Humbert
2016-07-03Revert "Changed layout of left hand main layer"Josh Colbeck
2016-07-03Changed layout of left hand main layerJoshua Colbeck
2016-07-02Merge pull request #472 from Wigguno/masterJack Humbert