summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | compiled.hex files should not be included in the repo; they represent generat...Christopher Browne2016-06-1526-37625/+0
* | Should not include the compiled code in the repoChristopher Browne2016-06-151-0/+1
* | Ensure there is a value even if not working within a git repoChristopher Browne2016-06-151-1/+1
* | Split build date into a separate DEFINEChristopher Browne2016-06-152-4/+4
* | Add docsChristopher Browne2016-06-151-1/+2
* | Add in a version keyChristopher Browne2016-06-151-2/+8
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-1528-2764/+5339
|\|
| * Update the ergodox-ez/algernon keymap (#409)Gergely Nagy2016-06-1411-1353/+373
| * Makefile: Add QMK_VERSION & co to OPT_DEFS (#408)Gergely Nagy2016-06-141-1/+6
| * Add sgoodwin keymap for the KC60 (#410)Samuel Goodwin2016-06-144-1410/+2920
| * adds support for GH60 Satan keyboard (#407)TerryMathews2016-06-1312-0/+2040
| * Renaming planck/cbbrowne in keeping with recent naming conventions (#405)Christopher Browne2016-06-137-1501/+89
* | Simplify logic; no need to return so muchChristopher Browne2016-06-131-3/+0
* | Local change, not apropos to have in this repoChristopher Browne2016-06-131-25/+0
* | Simplify submitting my fave cbbrowne keystroke by using SEND_STRING()Christopher Browne2016-06-132-1/+4
* | Restructuring in keeping with recent changes to conventionsChristopher Browne2016-06-137-1505/+81
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-13516-72516/+143035
|\|