summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
* Move ALT...cbbrowne2016-09-152-5/+17
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-09-153-6/+9
|\
| * Merge pull request #758 from absenth/developmentErez Zukerman2016-09-143-6/+9
| |\
| | * Adding Space Cadet, And Correcting Ascii KeymapLars R. Noldan2016-09-143-6/+9
* | | Got Right SHIFT + Right CTRLcbbrowne2016-09-132-3/+10
* | | C macros for my favorite complex keystrokescbbrowne2016-09-131-11/+18
* | | Give layers longer namescbbrowne2016-09-131-5/+5
* | | Give layers longer namescbbrowne2016-09-131-20/+20
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-09-1215-34/+976
|\| |
| * | Merge pull request #734 from adiabatic/masterErez Zukerman2016-09-113-10/+12
| |\ \
| | * | - Make thumb-accessible ⌥ and ⌃ into right-⌥ and right-⌃Nathan Sharfi2016-09-072-10/+12
| | * | zweihander: rename to MakefileNathan Sharfi2016-09-071-0/+0
| * | | Merge pull request #740 from absenth/developmentErez Zukerman2016-09-113-0/+191
| |\ \ \ | | | |/ | | |/|
| | * | Updated Image HeaderLars2016-09-081-0/+0
| | * | first commit of Absenth's Ergodox FirmwareLars2016-09-083-0/+191
| * | | Merge pull request #746 from DidierLoiseau/bépoErez Zukerman2016-09-112-0/+689
| |\ \ \
| | * | | Added readme.md for bepo_csaDidier Loiseau2016-09-111-0/+162
| | * | | Fixed compilation issues after the mergeDidier Loiseau2016-09-111-0/+527
| * | | | Merge pull request #743 from shelaf/patch-2Jack Humbert2016-09-113-16/+12
| |\ \ \ \
| | * | | | Variables in Makefile are ignored in rules.mkshela2016-09-113-6/+2
| | * | | | fix variable value of rules.mkshela2016-09-111-10/+10
| | |/ / /
| * | | | Add PCBDOWNDaniel Bordak2016-09-101-0/+4
| * | | | Update to new default keymapDaniel Bordak2016-09-102-5/+65
| * | | | Fix typoDaniel Bordak2016-09-101-3/+3
| |/ / /
* / / / Ongoing experiment; have a special layer for RESETcbbrowne2016-09-122-6/+61
|/ / /
* | | Merge pull request #715 from profet23/masterJack Humbert2016-09-094-0/+234
|\ \ \ | |/ / |/| |
| * | Changing keymap name to "profet_80"profet232016-09-083-0/+0
| * | Removing separate ergodox80 project.profet232016-09-0621-1930/+55
| * | Removing/editing non applicable readmeprofet232016-09-024-171/+2
| * | Adding 80 Key Ergodox Supportprofet232016-09-0221-0/+2278
* | | Merge pull request #736 from tong92/masterJack Humbert2016-09-083-0/+274
|\ \ \
| * | | add tong92 keymaptong922016-09-083-0/+274
| | |/ | |/|
* | | 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-0745-797/+2748
| |\| |
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-29139-5814/+6444
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-2650-288/+2915
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-2418-5/+1081
| |\ \ \ \ \
| * | | | | | More notescbbrowne2016-08-241-3/+4
| * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-2298-606/+8317
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-1551-1245/+3312
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-128-0/+467
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ 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-084-206/+187
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-08-04247-1869/+4634
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-286-23/+366
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-07-261-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \