summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #735 from romanzolotarev/patch-1Jack Humbert2016-09-081-1/+1
|\
| * Fix typoRoman Zolotarev2016-09-081-1/+1
* | Merge pull request #733 from cbbrowne/masterJack Humbert2016-09-083-15/+38
|\ \
| * | Borrowed joint Shift/Enter idea from sgoodwin mappingcbbrowne2016-09-072-1/+2
| * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-09-0751-823/+2846
| |\|
| * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-29191-10220/+11500
| |\ \
| * \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-2652-290/+2926
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-2432-13/+1526
| |\ \ \ \
| * | | | | More notescbbrowne2016-08-241-3/+4
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-22132-2857/+11027
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-154-30/+221
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-1555-1259/+3328
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-1210-2/+469
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-107-4/+775
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-0915-14/+585
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-087-208/+273
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-04264-2318/+5419
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-289-24/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-273-1/+376
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-261-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-2598-436/+6780
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Notes about changesChristopher Browne2016-07-181-8/+8
| * | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-154-10/+229
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-1256-747/+1343
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | I did not like Space Cadet paren; it jumps in in way too many extra casesChristopher Browne2016-07-121-1/+1
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-07145-183/+9398
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-04115-502/+10955
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-3080-1058/+1783
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-2812-182/+308
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-24248-139888/+2567
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-239-0/+1507
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Use Space Cadet parens on LSFTChristopher Browne2016-06-221-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-221-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-22559-17239/+3753
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-2163-23942/+23799
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-205206-2308010/+6111
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compiled.hex files should not be included in the repo; they represent generat...Christopher Browne2016-06-1526-37625/+0
| * | | | | |