summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-0992-370/+3945
| | |\| | | | |
| | * | | | | | Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethiumPriyadi Iman Nurcahyo2017-01-290-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-01-1772-312/+3010
| | | |\ \ \ \ \ \
| | | * | | | | | | minimize LEDsPriyadi Iman Nurcahyo2017-01-091-74/+74
| | | * | | | | | | fix greek layersPriyadi Iman Nurcahyo2017-01-092-4/+5
| | | * | | | | | | Implement greek layers on my Promethium layoutPriyadi Iman Nurcahyo2017-01-091-5/+182
| | * | | | | | | | minimize LEDsPriyadi Iman Nurcahyo2017-01-291-74/+74
| | * | | | | | | | fix greek layersPriyadi Iman Nurcahyo2017-01-292-4/+5
| | * | | | | | | | Implement greek layers on my Promethium layoutPriyadi Iman Nurcahyo2017-01-291-5/+182
| * | | | | | | | | Merge pull request #1087 from mneme/masterJack Humbert2017-02-116-55/+64
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | correct spelling in readmeDavid Olsson2017-02-111-1/+1
| | * | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareDavid Olsson2017-02-11154-966/+6752
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | update readmeDavid Olsson2017-02-116-7/+9
| | * | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareDavid Olsson2017-01-1869-361/+2594
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Don't change ralt to lalt, it's really not the same thing on windows.David Olsson2017-01-171-39/+41
| | * | | | | | | | | | | whitespace fixesDavid Olsson2017-01-161-10/+12
| | * | | | | | | | | | | vi style arrow keys. Live unicode switch supportDavid Olsson2017-01-161-8/+11
| * | | | | | | | | | | | Merge pull request #1088 from Mauin/gon_nerdJack Humbert2017-02-1112-0/+331
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | add GON NerDMarvin Ramin2017-02-1112-0/+331
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | don't try to build the readmeJack Humbert2017-02-111-1/+1
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #1083 from VoodaGod/bone2planckJack Humbert2017-02-101-4/+4
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | fixed readme (i swear)VoodaGod2017-02-101-4/+4
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #1073 from qmk/backlight_changesJack Humbert2017-02-091-32/+62
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| | * | | | | | | | | | added functionality for just a portJack Humbert2017-02-071-32/+62
| * | | | | | | | | | | Merge pull request #1078 from VoodaGod/bone2planckJack Humbert2017-02-094-54/+142
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | updated layout & readmeVoodaGod2017-02-092-37/+39
| | * | | | | | | | | | | more formattingVoodaGod2017-02-091-2/+13
| | * | | | | | | | | | | readme formatting changesVoodaGod2017-02-091-61/+61
| | * | | | | | | | | | | updated readmeVoodaGod2017-02-091-7/+10
| | * | | | | | | | | | | updated bone2planck keymap & readmeVoodaGod2017-02-094-26/+98
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | 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