summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-02-09Merge branch 'master' into promethiumPriyadi Iman Nurcahyo
2017-02-07Merge pull request #1074 from dungdung/kc60_ledJack Humbert
Moved KC60 capslock LED code to standard led_set_kb…
2017-02-07accept numbers in travis buildJack Humbert
2017-02-07Moved KC60 capslock LED code to standard led_set_kb so it can be overridden ↵dungdung
by users
2017-02-07Merge pull request #1070 from jimmyhchan/fixSplitJack Humbert
Lets split readme eeprom master hand fixes
2017-02-07rename I2C_MASTER_RIGHT to MASTER_RIGHT since this works for serial as wellJimmy Chan
2017-02-07udpate readme to reflect QMK and not having the Makefile from ahtn's repoJimmy Chan
2017-02-07correctly put eeprom EE_HANDS at addr 0x0a (decimal 10). default to rev2 ↵Jimmy Chan
project. do not default EE_HANDS for the serial keymap if you compare split_util.h with the original project by ahtn, the address we look for isLeftHand config went from addr 7 to addr 10 (decimal). The EEP files were not updated. EE_HANDS should not be enabled by default since it's more confusing for most users
2017-02-07Merge pull request #1072 from nicinabox/improve-ls-avrdude-targetJack Humbert
Check for Pro Micro serial port automatically
2017-02-07Merge pull request #1062 from luizribeiro/fix-winJack Humbert
Fix V-USB bug on Windows 10
2017-02-07Merge pull request #1071 from dungdung/rgb_tweaksJack Humbert
RGB tweaks
2017-02-07Merge pull request #1068 from adzenith/masterJack Humbert
Minor cleanup
2017-02-07Merge pull request #1046 from LukeSilva/masterJack Humbert
Add Tapping Macros to QMK
2017-02-07Merge pull request #1057 from priyadi/selectable_outputJack Humbert
Implement runtime selectable output (USB or BT)
2017-02-07pass through travis errorsJack Humbert
2017-02-07Merge pull request #1056 from upils/masterJack Humbert
Add reddot handwired keyboard.
2017-02-07Merge pull request #1053 from TerryMathews/masterJack Humbert
Let's Split: establish rev2fliphalf subproject
2017-02-07variable scope fix for travisJack Humbert
2017-02-07correctly assign bash variableJack Humbert
2017-02-07fix typoJack Humbert
2017-02-07add commaJack Humbert
2017-02-07Merge pull request #1069 from hot-leaf-juice/masterJack Humbert
change cmd-l and cmd-r for actual home and end
2017-02-07try building only keyboards neededJack Humbert
2017-02-07Merge pull request #1041 from folkert4/masterJack Humbert
Added Espynn's keymap
2017-02-07Merge pull request #1047 from lordchair/keymap_yaleJack Humbert
yale planck layout
2017-02-06Check for a new serial port every secondNic Aitch
2017-02-06Merge pull request #1048 from smt/smt/planckJack Humbert
Add smt's keymap for Planck
2017-02-06Merge pull request #1059 from qmk/hf/algr_tJack Humbert
Introduces ALGR_T for dual-function AltGr
2017-02-06Merge pull request #1036 from nicinabox/lets-split-improvementsJack Humbert
Lets Split flashing improvements
2017-02-06Merge pull request #960 from ofples/feature/combosJack Humbert
Keyboard combination triggers
2017-02-06Reverse rev2 and rev2fliphalfTerryMathews
Flipped definitions on what constitutes "fliphalf" by popular demand.
2017-02-06Revert "Reverse rev2 and rev2fliphalf"TerryMathews
This reverts commit 0537977ba1412aa2ba753e152eec445e18858244.
2017-02-06Reverse rev2 and rev2fliphalfTerryMathews
Flipped definitions on what constitutes "fliphalf" by popular demand.
2017-02-06Merge pull request #1010 from SjB/oneshot_timeout_fixJack Humbert
oneshot timeout would only timeout after an event.
2017-02-06Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairsJack Humbert
Add support for Unicode supplementary planes on OS X
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06Added non-animated gradient modedungdung
2017-02-06Added mode reverse step functiondungdung
2017-02-06Christmas mode now works with even RGBED_NUMdungdung
Added Christmas mode steps to reduce red and green colors blending into each other Added Christmas mode interval Increased green hue to 120
2017-02-06Merge pull request #1030 from SjB/refactor_register_code16Jack Humbert
speeding up (un)register_code16
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06[skip build] testing travis scriptJack Humbert
2017-02-06fixes qmk.fm linking, tests out auto version incrementingJack Humbert
2017-02-06change cmd-l and cmd-r for actual home and endCallum Oakley
2017-02-05Minor cleanupNikolaus Wittenstein