summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-221-1/+2
|\
| * well that didn't workJack Humbert2016-06-221-4/+0
| * adds author block to readmeJack Humbert2016-06-221-1/+6
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-22559-17239/+3753
|\|
| * Merge pull request #433 from algernon/ergodox-ez/algernonErez Zukerman2016-06-2211-331/+351
| |\
| | * ergodox_ez: Update the algernon keymap to v1.2Gergely Nagy2016-06-2211-331/+351
| |/
| * increase leader seq size to 5Jack Humbert2016-06-212-5/+9
| * Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432)Jack Humbert2016-06-21545-15315/+1752
| * adds backlight levels to the satan keyboard (#431)Jack Humbert2016-06-215-1561/+1604
| * adds fuse settings for atmega32u4, fixes keymap_extras includesJack Humbert2016-06-2114-12/+22
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-2163-23942/+23799
|\|
| * Warning reductions (#430)Jack Humbert2016-06-2155-23923/+23760
| * Change base box to avoid breakage in Arch box (#429)dragon7882016-06-211-2/+2
| * Fix the make all-keyboards command (#422)fredizzimo2016-06-211-9/+26
| * reduces rgblight warnings, integrates completely (#428)Jack Humbert2016-06-216-8/+11
* | More notesChristopher Browne2016-06-212-0/+15
* | Improve docs a bitChristopher Browne2016-06-212-1/+4
* | Add filler to make layering clearer;Christopher Browne2016-06-212-7/+10
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-2179-7711/+7318
|\|
| * updates all config.h and Makefiles to correct references, textJack Humbert2016-06-2158-2110/+102
| * Added stanleylai's personal keymap (#420)Stanley Lai2016-06-2112-3323/+5024
| * Fresh hes for experimental layoutJack & Erez2016-06-201-1119/+1032
| * [Jack & Erez] Fixes Space Cadet right shiftJack & Erez2016-06-202-5/+5
| * Adapts experimental layout file formatErez Zukerman2016-06-202-2/+7
| * Adds compiled default firmwareErez Zukerman2016-06-201-1157/+1152
| * [Jack & Erez] Adds dedicated Version keyErez Zukerman2016-06-201-5/+3
| * [Jack & Erez] Tweaks makefile for sanityErez Zukerman2016-06-201-7/+7
| * Removes .gitattributesErez Zukerman2016-06-201-2/+0
| * [Erez & Jack] Updates build guideErez Zukerman2016-06-202-21/+26
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-205206-2308010/+6111
|\|
| * endline normalisation, treat .hex as bin, updates kc60 hex filesJack Humbert2016-06-193-3316/+3321
| * Added WS2812 support for KC60 (#419)Stanley Lai2016-06-1914-1458/+3792
| * Add quick version of the all-* makefile targets (#417)fredizzimo2016-06-182-7/+16
| * Cleans up quantum/keymap situation, removes extra lufa folders (#416)Jack Humbert2016-06-185186-2306512/+2207
| * allow overriding of TARGETJack Humbert2016-06-171-1/+1
| * adds power_up to quantum's matrix fileJack Humbert2016-06-171-0/+24
| * prevents ergodox_ez from waking up machine (#375)Jack Humbert2016-06-171-0/+19
| * addresses #369Jack Humbert2016-06-172-8/+24
| * fix for parent folders with spaces (#403)Jack Humbert2016-06-171-2/+3
| * removes extra dfu erase (#415)Eric Tang2016-06-171-29/+27
| * Sample of using build info to generate keystrokes (#412)Christopher Browne2016-06-166-1603/+1595
* | Revert removals of compiled filesChristopher Browne2016-06-1628-1/+39270
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-161-14/+20
|\|
| * correctly test to see if awk existsJack Humbert2016-06-161-1/+1
| * make awk optional (uses cat)Jack Humbert2016-06-161-14/+20
* | Add rule to ignore contents of .build directories; their contents are generatedChristopher Browne2016-06-151-0/+1
* | Remove more generated filesChristopher Browne2016-06-151-1645/+0
* | Fix spelling in commentChristopher Browne2016-06-151-2/+2
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-155-14/+1159
|\|
| * updates experimental planck keymap, adds basic layoutJack Humbert2016-06-156-1593/+2754