summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-02-0826-3455/+3814
|\
| * Merge pull request #130 from jacobono/jacobonoErez Zukerman2016-02-087-0/+1450
| |\
| | * add hex fileDaniel Mijares2016-02-061-0/+1142
| | * my personal ergodox keymap layoutDaniel Mijares2016-02-066-0/+308
| * | Updates documentation, adds Cmd/Win dual-function keyErez Zukerman2016-02-085-1443/+1098
| * | Merge pull request #134 from dragon788/patch-2Jack Humbert2016-02-071-1/+1
| |\ \
| | * | Added note about using avr_setup.shdragon7882016-02-071-1/+1
| |/ /
| * | advanced macro stuff for READMEJack Humbert2016-02-071-4/+0
| * | advanced macro stuff for READMEJack Humbert2016-02-071-1/+1
| * | advanced macro stuff for READMEJack Humbert2016-02-071-9/+9
| * | advanced macro stuff for READMEJack Humbert2016-02-071-2/+66
| * | README changesJack Humbert2016-02-073-337/+4
| * | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2016-02-0724-4295/+5163
| |\ \
| | * \ Merge pull request #131 from Vifon/patch-1Jack Humbert2016-02-071-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Use boolean AND instead of bitwise (possible typo)Wojciech Siewierski2016-02-071-1/+1
| | |/
| | * Merge pull request #129 from cbbrowne/masterJack Humbert2016-02-051-57/+217
| | |\
| | * | Update PCB_GUIDE.mdJack Humbert2016-02-051-0/+1
| | * | Fixes CM_SCLN and updates docs for ColemakErez Zukerman2016-02-054-38/+39
| | * | Tweaks symbol layer (see changleog)Erez Zukerman2016-02-053-1477/+1137
| | * | Merge pull request #126 from fernandodeperto/keymap_nordicJack Humbert2016-02-041-3/+3
| | |\ \
| | | * | Fix 2 macros in the Nordic keymapFernando Mendonca2016-02-051-3/+3
| | |/ /
| | * | Merge pull request #124 from zorab47/disable-console-by-defaultErez Zukerman2016-02-041-1/+1
| | |\ \
| | | * | Disable console for improved performanceCharles Maresh2016-02-031-1/+1
| | * | | Merge pull request #125 from gkubed/patch-1Erez Zukerman2016-02-041-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Update QUICK_START.mdGuyon Cumby2016-02-041-1/+1
| | |/ /
| * | | README changesJack Humbert2016-02-072-158/+23
* | | | Add in XOR of lowest 8 bits of system timer to encourage more randomness of t...Christopher Browne2016-02-061-147/+157
| |_|/ |/| |
* | | Remove obsolete commentsChristopher Browne2016-02-031-9/+0
* | | Comment things moreChristopher Browne2016-02-031-1/+2
* | | Random characters now working AOKChristopher Browne2016-02-031-14/+157
* | | Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChristopher Browne2016-02-031-48/+60
|\ \ \
| * | | More experiments with mapping, notably adding in the random bitsChristopher Browne2016-02-031-48/+60
| * | | Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChristopher Browne2016-02-012-32/+68
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-01-312-29/+163
| |\ \ \ \
* | \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-02-035-1315/+1453
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Merge pull request #123 from cbbrowne/masterJack Humbert2016-02-014-0/+183
| |\ \ \ \
| * | | | | Refreshes default keymap for single tap L1 switchErez Zukerman2016-02-011-1285/+1285
| * | | | | Merge pull request #116 from tachk/readmeFixJack Humbert2016-01-311-1/+1
| |\ \ \ \ \
| | * | | | | Fix for broken link in readme.Kacey A2016-01-301-1/+1
| * | | | | | Merge pull request #119 from seancaffery/teensynoteJack Humbert2016-01-311-0/+4
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Clarify Atreus supportSean Caffery2016-01-311-0/+4
| * | | | | | Merge pull request #118 from sboesebeck/masterErez Zukerman2016-01-312-29/+163
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | some fixes in readmeStephan Bösebeck2016-01-311-2/+3
| | * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-3111-1466/+2238
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | fixed some copy paste errorsStephan Bösebeck2016-01-291-2/+2
| | * | | | | added a egoshooter layerStephan Bösebeck2016-01-291-4/+58
| | * | | | | Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-01-290-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-286-0/+1718
| | | |\ \ \ \ \
| | * | \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-296-0/+1718
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | | |/ / / / /
| | * | | | | | added new macrosStephan Bösebeck2016-01-281-1/+27