summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-048-108/+1848
|\
| * Merge pull request #235 from mbarkhau/masterErez Zukerman2016-04-042-92/+123
| |\ | | | | | | add indent to generated keymap
| | * add indent to generated keymapManuel Barkhau2016-04-032-92/+123
| | |
| * | music mode fileJack Humbert2016-04-036-16/+1725
| | |
* | | minor updates - new PNGStephan Bösebeck2016-04-032-16/+20
|/ /
* | Merge pull request #213 from mbarkhau/masterErez Zukerman2016-04-034-0/+2890
|\| | | | | Add manuneo layout
| * use action function for unicodeManuel Barkhau2016-04-024-2540/+1651
| |
| * Update compile_keymap.pymbarkhau2016-03-291-13/+11
| |
| * add hex fileManuel Barkhau2016-03-281-0/+1624
| |
| * Merge remote-tracking branch 'origin/master'Manuel Barkhau2016-03-2836-1305/+4815
| |\
| * | Refactor compiler codeManuel Barkhau2016-03-283-1661/+1900
| | |
| * | Add manuneo layoutManuel Barkhau2016-03-273-0/+1918
| | |
* | | Merge pull request #234 from sboesebeck/masterErez Zukerman2016-04-034-1330/+1349
|\ \ \ | | | | | | | | several iterations later
| * \ \ Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-04-0284-2017/+4991
| |\ \ \
| | * \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-0181-1909/+4883
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Merge pull request #233 from tak3over/patch-1Jack Humbert2016-04-011-0/+136
|\ \ \ \ \ | | | | | | | | | | | | Create tak3over.c
| * | | | | Create tak3over.ctak3over2016-04-011-0/+136
|/ / / / / | | | | | | | | | | Custom keymap with an additional function layer for numpad, pgup, pgdn, del, ins, home, end, and additional arrow keys.
* | | | | adding files is always smartJack Humbert2016-04-017-0/+327
| | | | |
* | | | | Merge pull request #226 from squisher/dvorak_intl_squisherErez Zukerman2016-04-016-0/+1341
|\ \ \ \ \ | | | | | | | | | | | | Squisher's international dvorak variant for ergodox ez
| * | | | | Also add compiled hex fileDavid Mohr2016-03-301-0/+1127
| | | | | |
| * | | | | Squisher's international dvorak variant for ergodox ezDavid Mohr2016-03-305-0/+214
| | | | | | | | | | | | | | | | | | | | | | | | See README.md
* | | | | | Merge pull request #230 from IBNobody/masterJack Humbert2016-03-311-11/+68
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fixed Setup Script
| * | | | | Drastically rewrote the path script to handle Explorer's stubborn grasp of ↵IBNobody2016-03-301-11/+68
|/ / / / / | | | | | | | | | | | | | | | EnvVars. Tested on Win7.
* | | | | Merge pull request #229 from NoahAndrews/patch-5Jack Humbert2016-03-301-2/+2
|\ \ \ \ \ | | | | | | | | | | | | The readme was also wrong about the conflict between audio and RGB
| * | | | | Update README.mdNoah Andrews2016-03-301-2/+2
|/ / / / /
* | | | | Merge pull request #227 from NoahAndrews/patch-4Jack Humbert2016-03-301-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fixed minor issues with Preonic readme
| * | | | | Fixed minor issues with Preonic readmeNoah Andrews2016-03-301-2/+2
| | | | | |
* | | | | | Merge pull request #228 from mrfoto/fix-planck-diagramJack Humbert2016-03-301-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Tiny fix of Planck diagrams
| * | | | | Tiny fix of Planck diagramsMiha Rekar2016-03-301-2/+2
|/ / / / /
* | | | | preonic readmeJack Humbert2016-03-301-9/+3
| | | | |
* | | | | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2016-03-30179-41877/+39434
|\ \ \ \ \
| * \ \ \ \ Merge pull request #224 from NoahAndrews/make-keymap-names-consistentJack Humbert2016-03-2941-42/+45
| |\ \ \ \ \ | | | | | | | | | | | | | | Make keymap names more consistent
| | * | | | | Updated several keyboard folders to use new keymap naming schemeNoah Andrews2016-03-2941-42/+45
| | | | | | |
| | * | | | | Merge remote-tracking branch 'jackhumbert/master' into ↵Noah Andrews2016-03-29147-40692/+40208
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | make-keymap-names-consistent
| * | | | | | Merge pull request #223 from NoahAndrews/patch-3Jack Humbert2016-03-291-4/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix #198
| | * | | | | | Fix #198Noah Andrews2016-03-291-4/+9
| |/ / / / / /
| * | | | | | Merge pull request #222 from NoahAndrews/patch-2Jack Humbert2016-03-291-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix error in Planck makefile comment
| | * | | | | | Fix error in Planck makefile commentNoah Andrews2016-03-291-1/+1
| |/ / / / / / | | | | | | | | | | | | | | [This comment](https://www.reddit.com/r/olkb/comments/428umx/rgb_underglow/czaivbc) states that because both audio output and RGB support require the user of timer 3, they can't be enabled at the same time. That makes sense, I can see where audio.c uses timer 3. But this comment in the code states that the incompatibility is with MIDI support, which doesn't make sense based on what I see in the code. Please enlighten me if I'm mistaken.
* | | | | | | .hex filesJack Humbert2016-03-303-2/+2893
| | | | | | |
* | | | | | | preonic updateJack Humbert2016-03-3020-1846/+66
| | | | | | |
| | | | * | | minor tweaks at the keymap, new png for documentationStephan Bösebeck2016-04-012-6/+6
| | | | | | |
| | | | * | | fixed de_osx prefix in keymap include to avoid conflictsStephan Bösebeck2016-03-312-103/+103
| | | | | | |
| | | * | | | new keymapStephan Bösebeck2016-04-021-1/+9
| | | |/ / /
| | | * | | added CTL_Shift / Hash macroStephan Bösebeck2016-03-291-11/+24
| | | | | |
| | | * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-295-18/+55
| | | |\ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #219 from IBNobody/masterJack Humbert2016-03-284-13/+48
| |\ \ \ \ \ | | | | | | | | | | | | | | Master
| | * | | | | Minor Tweaks and DocumentationIBNobody2016-03-283-12/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed compiler warning by including bootloader.h in keymap_common.c. Changed FORCE_NKRO to only be applied if NKRO_ENABLE is defined. Added extra documentation to the template config.h
| | * | | | | Added command to turn LED indicators off while sleepingIBNobody2016-03-281-1/+4
| | | | | | |
| * | | | | | Merge pull request #220 from NoahAndrews/improve-buildguideJack Humbert2016-03-281-5/+7
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | Added clarifying steps to Windows section of build guide
| | * | | | | Added clarifying steps to Windows section of build guideNoah Andrews2016-03-281-5/+7
| | | | | | |