summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #190 from yoyoerx/function_pointersErez Zukerman2016-03-2282-41462/+33034
|\
| * Pull request 190 resolution with 'qmk/master' for mergeyoyoerx2016-03-2115-2579/+4317
| |\ | |/ |/|
* | Merge pull request #205 from romanzolotarev/masterErez Zukerman2016-03-214-0/+1309
|\ \
| * | Update readmeRoman Zolotarev2016-03-191-1/+1
| * | Update layoutRoman Zolotarev2016-03-1912-192/+67
| * | Swap volup and voldownRoman Zolotarev2016-03-181-2/+2
| * | Add Roman's LayoutRoman Zolotarev2016-03-1811-0/+1434
* | | Merge pull request #203 from XenoBits/masterErez Zukerman2016-03-205-1227/+1174
|\ \ \
| * | | Fixed png imageMaxime Millet2016-03-201-0/+0
| * | | CSharp dev layout V2Maxime Millet2016-03-205-1227/+1174
* | | | Merge pull request #201 from uzytkownik/masterErez Zukerman2016-03-202-1497/+1503
|\ \ \ \ | |_|/ / |/| | |
| * | | Add waits to prevent KVM from hangingMaciej Piechotka2016-03-172-1490/+1492
| * | | Put frequently used keys in shell (-=) under thumbMaciej Piechotka2016-03-172-9/+9
| * | | Add missing breaks in mpiechotka ergodox_ez keyboardMaciej Piechotka2016-03-172-1233/+1237
|/ / /
* | | Merge pull request #194 from DidierLoiseau/bépo-keymap-headerJack Humbert2016-03-141-0/+311
|\ \ \
| * | | Keymap header for the BÉPO layoutDidier Loiseau2016-03-131-0/+311
* | | | Merge pull request #195 from krid78/masterJack Humbert2016-03-141-2/+2
|\ \ \ \
| * | | | fixes an obvious typo to have DE_LCBR produce {Daniel Kriesten2016-03-141-2/+2
| |/ / /
* | | | Merge pull request #197 from yoyoerx/windocsJack Humbert2016-03-141-6/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Cygwin Based Users Guide v0.6 -fixes to dfu-programmer buildyoyoerx2016-03-141-6/+8
|/ / /
* | | Merge pull request #192 from mitchlloyd/mitch-layoutJack Humbert2016-03-101-0/+49
|\ \ \
| * | | First keyboard layoutMitch Lloyd2016-03-101-0/+49
|/ / /
* | | Merge pull request #191 from yoyoerx/windocsJack Humbert2016-03-101-347/+350
|\ \ \
| * \ \ Merge remote-tracking branch 'qmk/master' into windocsyoyoerx2016-03-101-27/+24
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #187 from yoyoerx/windocsJack Humbert2016-03-091-18/+128
|\ \ \ \
| | * | | Cygwin Based Users Guide v0.5 -further correctionsyoyoerx2016-03-091-347/+353
| |/ / /
| * / / Cygwin Based Users Guide v0.4 -corrections/dfu buildyoyoerx2016-03-091-18/+128
|/ / /
| | * PR190hotfix.sh, fresh hexes, makeallhex.sh scriptyoyoerx2016-03-1133-41292/+32894
| | * Merge branch 'function_pointers' of github.com:yoyoerx/qmk_keyboard into func...yoyoerx2016-03-100-0/+0
| | |\
| | | * Addressed void* return warning & coding styleyoyoerx2016-03-099-63/+45
| |_|/ |/| |
| | * Addressed void* return warning in all keymapsyoyoerx2016-03-1048-179/+148
| |/ |/|
* | Adds a readme with a link to the blog postErez Zukerman2016-03-082-0/+5
* | Merge pull request #185 from nrrkeene/masterErez Zukerman2016-03-073-0/+1312
|\ \
| * | The Ordinary Layout, designed to be similar to traditional keyboards, by Nich...Nicholas Keene2016-03-063-0/+1312
* | | Merge pull request #177 from yoyoerx/windocsJack Humbert2016-03-071-0/+237
|\ \ \ | |/ / |/| |
| * | Cygwin Based Users Guidev0.2 -formatting revisionsyoyoerx2016-03-041-47/+47
| * | Cygwin Based Users Guide v0.1yoyoerx2016-03-041-0/+237
* | | Merge pull request #180 from NoahAndrews/add-build-instructionsJack Humbert2016-03-041-1/+20
|\ \ \
| * | | Added build instructions to BUILD_GUIDE.mdNoah Andrews2016-03-041-1/+20
|/ / /
* | | Merge pull request #179 from NoahAndrews/add-win-linux-instructionsJack Humbert2016-03-041-1/+11
|\ \ \ | |/ / |/| |
| * | Added Windows and Linux instructions to BUILD_GUIDE.mdNoah Andrews2016-03-041-1/+11
|/ /
* | Merge pull request #176 from NoahAndrews/fix-new-projectsJack Humbert2016-03-041-1/+1
|\ \
| * | Remove extraneous commaNoah Andrews2016-03-041-1/+1
|/ /
* | Merge pull request #171 from NoahAndrews/restructure-documentationJack Humbert2016-03-044-2/+30
|\ \
| * | Clarified recommended Mac setup methodNoah Andrews2016-03-021-2/+4
| * | Updated README to point to new build guideNoah Andrews2016-03-021-2/+3
| * | Added Mac section (copy/pasted from PCB_GUIDE.md)Noah Andrews2016-03-021-0/+10
| * | Renamed handwriting guide to fit repository conventionNoah Andrews2016-03-021-0/+0
| * | Added placeholder for windows section of build guideNoah Andrews2016-03-022-2/+3
| * | Added Vagrant explanationNoah Andrews2016-03-021-1/+14