summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1079 from r2d2rogers/patch-1Jack Humbert2017-02-091-1/+1
|\
| * [Typo] correct link to default keymap in readme.Rob Rogers2017-02-091-1/+1
|/
* Merge pull request #1074 from dungdung/kc60_ledJack Humbert2017-02-073-34/+15
|\
| * Moved KC60 capslock LED code to standard led_set_kb so it can be overridden b...dungdung2017-02-073-34/+15
* | accept numbers in travis buildJack Humbert2017-02-071-1/+1
|/
* Merge pull request #1070 from jimmyhchan/fixSplitJack Humbert2017-02-077-23/+87
|\
| * rename I2C_MASTER_RIGHT to MASTER_RIGHT since this works for serial as wellJimmy Chan2017-02-074-6/+10
| * udpate readme to reflect QMK and not having the Makefile from ahtn's repoJimmy Chan2017-02-071-14/+72
| * correctly put eeprom EE_HANDS at addr 0x0a (decimal 10). default to rev2 proj...Jimmy Chan2017-02-074-5/+7
|/
* Merge pull request #1072 from nicinabox/improve-ls-avrdude-targetJack Humbert2017-02-071-4/+6
|\
| * Check for a new serial port every secondNic Aitch2017-02-061-4/+6
* | Merge pull request #1062 from luizribeiro/fix-winJack Humbert2017-02-071-2/+2
|\ \
| * | Fix V-USB bug on Windows 10Luiz Ribeiro2017-02-011-2/+2
* | | Merge pull request #1071 from dungdung/rgb_tweaksJack Humbert2017-02-072-5/+41
|\ \ \
| * | | Added non-animated gradient modedungdung2017-02-062-1/+20
| * | | Added mode reverse step functiondungdung2017-02-062-0/+9
| * | | Christmas mode now works with even RGBED_NUMdungdung2017-02-062-4/+12
* | | | Merge pull request #1068 from adzenith/masterJack Humbert2017-02-079-25/+22
|\ \ \ \
| * | | | Minor cleanupNikolaus Wittenstein2017-02-053-8/+2
| * | | | Add new DIODE_DIRECTION optionNikolaus Wittenstein2017-02-053-8/+12
| * | | | Remove unused matrix_raw variable in matrix.cNikolaus Wittenstein2017-02-051-2/+0
| * | | | Add missing header to ergodox ordinary keymapNikolaus Wittenstein2017-02-031-0/+1
| * | | | Fix compile warnings in egodox robot_test_layoutNikolaus Wittenstein2017-02-031-4/+4
| * | | | Fix compile warnings in light_ws2812.cNikolaus Wittenstein2017-02-031-3/+3
* | | | | Merge pull request #1046 from LukeSilva/masterJack Humbert2017-02-077-6/+419
|\ \ \ \ \
| * | | | | Add luke keymap, as an example of the tapping macrosLuke Silva2017-01-293-0/+382
| * | | | | Add support for various tapping macrosLuke Silva2017-01-282-2/+25
| * | | | | Add ability to use tap macros without using functionsLuke Silva2017-01-272-1/+5
| * | | | | Fix documentation for TMK actionsLuke Silva2017-01-261-3/+7
* | | | | | Merge pull request #1057 from priyadi/selectable_outputJack Humbert2017-02-077-71/+189
|\ \ \ \ \ \
| * | | | | | Restrict outputselect to LUFA only for nowPriyadi Iman Nurcahyo2017-02-011-2/+2
| * | | | | | Fix wrong includePriyadi Iman Nurcahyo2017-02-011-1/+1
| * | | | | | Limit outputselect to AVR only for nowPriyadi Iman Nurcahyo2017-02-015-3/+6
| * | | | | | Move outputselect to parent dir to satisfy non LUFA keyboardsPriyadi Iman Nurcahyo2017-02-012-0/+0
| * | | | | | Add layer switcher keycodes: OUT_AUTO, OUT_USB, OUT_BT, OUT_BLEPriyadi Iman Nurcahyo2017-02-012-0/+39
| * | | | | | Implement runtime selectable output (USB or BT)Priyadi Iman Nurcahyo2017-02-014-69/+145
* | | | | | | pass through travis errorsJack Humbert2017-02-073-2/+6
* | | | | | | Merge pull request #1056 from upils/masterJack Humbert2017-02-078-0/+334
|\ \ \ \ \ \ \
| * | | | | | | Add reddot handwired keyboard.upils2017-01-318-0/+334
| |/ / / / / /
* | | | | | | Merge pull request #1053 from TerryMathews/masterJack Humbert2017-02-0710-4/+175
|\ \ \ \ \ \ \
| * | | | | | | Reverse rev2 and rev2fliphalfTerryMathews2017-02-062-8/+8
| * | | | | | | Revert "Reverse rev2 and rev2fliphalf"TerryMathews2017-02-062-7/+7
| * | | | | | | Reverse rev2 and rev2fliphalfTerryMathews2017-02-062-7/+7
| * | | | | | | Let's Split: establish rev2fliphalf subprojectTerryMathews2017-01-299-0/+171
* | | | | | | | variable scope fix for travisJack Humbert2017-02-072-5/+3
* | | | | | | | correctly assign bash variableJack Humbert2017-02-072-3/+3
* | | | | | | | fix typoJack Humbert2017-02-071-1/+1
* | | | | | | | add commaJack Humbert2017-02-071-1/+1
* | | | | | | | Merge pull request #1069 from hot-leaf-juice/masterJack Humbert2017-02-072-5/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | change cmd-l and cmd-r for actual home and endCallum Oakley2017-02-062-5/+3
| | |_|_|/ / / / | |/| | | | | |