summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into mod...Wojciech Siewierski2016-04-03
|\
| * Merge pull request #213 from mbarkhau/masterErez Zukerman2016-04-03
| |\
| | * use action function for unicodeManuel Barkhau2016-04-02
| | * Update compile_keymap.pymbarkhau2016-03-29
| | * add hex fileManuel Barkhau2016-03-28
| | * Merge remote-tracking branch 'origin/master'Manuel Barkhau2016-03-28
| | |\
| | * | Refactor compiler codeManuel Barkhau2016-03-28
| | * | Add manuneo layoutManuel Barkhau2016-03-27
| * | | Merge pull request #234 from sboesebeck/masterErez Zukerman2016-04-03
| |\ \ \
| | * \ \ Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-04-02
| | |\ \ \
| | | * \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-01
| | | |\ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #233 from tak3over/patch-1Jack Humbert2016-04-01
| |\ \ \ \ \
| | * | | | | Create tak3over.ctak3over2016-04-01
| |/ / / / /
| * | | | | adding files is always smartJack Humbert2016-04-01
| * | | | | Merge pull request #226 from squisher/dvorak_intl_squisherErez Zukerman2016-04-01
| |\ \ \ \ \
| | * | | | | Also add compiled hex fileDavid Mohr2016-03-30
| | * | | | | Squisher's international dvorak variant for ergodox ezDavid Mohr2016-03-30
| * | | | | | Merge pull request #230 from IBNobody/masterJack Humbert2016-03-31
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Drastically rewrote the path script to handle Explorer's stubborn grasp of En...IBNobody2016-03-30
| |/ / / / /
| * | | | | Merge pull request #229 from NoahAndrews/patch-5Jack Humbert2016-03-30
| |\ \ \ \ \
| | * | | | | Update README.mdNoah Andrews2016-03-30
| |/ / / / /
| * | | | | Merge pull request #227 from NoahAndrews/patch-4Jack Humbert2016-03-30
| |\ \ \ \ \
| | * | | | | Fixed minor issues with Preonic readmeNoah Andrews2016-03-30
| * | | | | | Merge pull request #228 from mrfoto/fix-planck-diagramJack Humbert2016-03-30
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Tiny fix of Planck diagramsMiha Rekar2016-03-30
| |/ / / / /
| * | | | | preonic readmeJack Humbert2016-03-30
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2016-03-30
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #224 from NoahAndrews/make-keymap-names-consistentJack Humbert2016-03-29
| | |\ \ \ \ \
| | | * | | | | Updated several keyboard folders to use new keymap naming schemeNoah Andrews2016-03-29
| | | * | | | | Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-cons...Noah Andrews2016-03-29
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge pull request #223 from NoahAndrews/patch-3Jack Humbert2016-03-29
| | |\ \ \ \ \ \
| | | * | | | | | Fix #198Noah Andrews2016-03-29
| | |/ / / / / /
| | * | | | | | Merge pull request #222 from NoahAndrews/patch-2Jack Humbert2016-03-29
| | |\ \ \ \ \ \
| | | * | | | | | Fix error in Planck makefile commentNoah Andrews2016-03-29
| | |/ / / / / /
| * | | | | | | .hex filesJack Humbert2016-03-30
| * | | | | | | preonic updateJack Humbert2016-03-30
| | | | | * | | minor tweaks at the keymap, new png for documentationStephan Bösebeck2016-04-01
| | | | | * | | fixed de_osx prefix in keymap include to avoid conflictsStephan Bösebeck2016-03-31
| | | | * | | | new keymapStephan Bösebeck2016-04-02
| | | | |/ / /
| | | | * | | added CTL_Shift / Hash macroStephan Bösebeck2016-03-29
| | | | * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-29
| | | | |\ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge pull request #219 from IBNobody/masterJack Humbert2016-03-28
| | |\ \ \ \ \
| | | * | | | | Minor Tweaks and DocumentationIBNobody2016-03-28
| | | * | | | | Added command to turn LED indicators off while sleepingIBNobody2016-03-28
| | * | | | | | Merge pull request #220 from NoahAndrews/improve-buildguideJack Humbert2016-03-28
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Added clarifying steps to Windows section of build guideNoah Andrews2016-03-28
| | | * | | | | Merge remote-tracking branch 'jackhumbert/master' into improve-buildguideNoah Andrews2016-03-28
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / / | | | |/| | |
| | | | | * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-28
| | | | | |\ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge pull request #216 from msc654/masterErez Zukerman2016-03-28
| | |\ \ \ \ \
| | | * | | | | Corrected duplicate image issueMatthew Carroll2016-03-28