summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-04-05Merge pull request #5 from jackhumbert/masterAlex Johnstone114-3408/+12942
Sync with upstream
2016-04-05updates to noiseJack Humbert5-5/+162
2016-04-05Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2-92/+123
2016-04-05add silent notesJack Humbert1-0/+3
2016-04-04Merge pull request #235 from mbarkhau/masterErez Zukerman2-92/+123
add indent to generated keymap
2016-04-03music mode fileJack Humbert6-16/+1725
2016-04-03add indent to generated keymapManuel Barkhau2-92/+123
2016-04-03Merge pull request #213 from mbarkhau/masterErez Zukerman4-0/+2890
Add manuneo layout
2016-04-03Merge pull request #234 from sboesebeck/masterErez Zukerman4-1330/+1349
several iterations later
2016-04-02use action function for unicodeManuel Barkhau4-2540/+1651
2016-04-02Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck84-2017/+4991
2016-04-02new keymapStephan Bösebeck1-1/+9
2016-04-01Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck81-1909/+4883
2016-04-01minor tweaks at the keymap, new png for documentationStephan Bösebeck2-6/+6
2016-04-01Merge pull request #233 from tak3over/patch-1Jack Humbert1-0/+136
Create tak3over.c
2016-04-01Create tak3over.ctak3over1-0/+136
Custom keymap with an additional function layer for numpad, pgup, pgdn, del, ins, home, end, and additional arrow keys.
2016-04-01adding files is always smartJack Humbert7-0/+327
2016-04-01Merge pull request #226 from squisher/dvorak_intl_squisherErez Zukerman6-0/+1341
Squisher's international dvorak variant for ergodox ez
2016-03-31fixed de_osx prefix in keymap include to avoid conflictsStephan Bösebeck2-103/+103
2016-03-31Merge pull request #230 from IBNobody/masterJack Humbert1-11/+68
Fixed Setup Script
2016-03-30Drastically rewrote the path script to handle Explorer's stubborn grasp of ↵IBNobody1-11/+68
EnvVars. Tested on Win7.
2016-03-30Also add compiled hex fileDavid Mohr1-0/+1127
2016-03-30Squisher's international dvorak variant for ergodox ezDavid Mohr5-0/+214
See README.md
2016-03-30Merge pull request #229 from NoahAndrews/patch-5Jack Humbert1-2/+2
The readme was also wrong about the conflict between audio and RGB
2016-03-30Update README.mdNoah Andrews1-2/+2
2016-03-30Merge pull request #227 from NoahAndrews/patch-4Jack Humbert1-2/+2
Fixed minor issues with Preonic readme
2016-03-30Merge pull request #228 from mrfoto/fix-planck-diagramJack Humbert1-2/+2
Tiny fix of Planck diagrams
2016-03-30Tiny fix of Planck diagramsMiha Rekar1-2/+2
2016-03-30Fixed minor issues with Preonic readmeNoah Andrews1-2/+2
2016-03-30preonic readmeJack Humbert1-9/+3
2016-03-30Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert179-41877/+39434
2016-03-30.hex filesJack Humbert3-2/+2893
2016-03-30preonic updateJack Humbert20-1846/+66
2016-03-30Merge pull request #224 from NoahAndrews/make-keymap-names-consistentJack Humbert41-42/+45
Make keymap names more consistent
2016-03-30Updated several keyboard folders to use new keymap naming schemeNoah Andrews41-42/+45
2016-03-30Merge remote-tracking branch 'jackhumbert/master' into ↵Noah Andrews147-40692/+40208
make-keymap-names-consistent
2016-03-29Merge pull request #223 from NoahAndrews/patch-3Jack Humbert1-4/+9
Fix #198
2016-03-29Fix #198Noah Andrews1-4/+9
2016-03-29Update compile_keymap.pymbarkhau1-13/+11
2016-03-29Merge pull request #222 from NoahAndrews/patch-2Jack Humbert1-1/+1
Fix error in Planck makefile comment
2016-03-29Fix error in Planck makefile commentNoah Andrews1-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.
2016-03-29added CTL_Shift / Hash macroStephan Bösebeck1-11/+24
2016-03-29Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck5-18/+55
2016-03-29Merge pull request #219 from IBNobody/masterJack Humbert4-13/+48
Master
2016-03-29Merge pull request #220 from NoahAndrews/improve-buildguideJack Humbert1-5/+7
Added clarifying steps to Windows section of build guide
2016-03-29Added clarifying steps to Windows section of build guideNoah Andrews1-5/+7
2016-03-29Minor Tweaks and DocumentationIBNobody3-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
2016-03-29Merge remote-tracking branch 'jackhumbert/master' into improve-buildguideNoah Andrews144-40683/+40157
2016-03-28add hex fileManuel Barkhau1-0/+1624
2016-03-28Merge remote-tracking branch 'origin/master'Manuel Barkhau36-1305/+4815
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-06 11:43:51 +0100