summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-04-05:pound: typoAlex Johnstone
2016-04-05:pound: typoAlex Johnstone
2016-04-05Merge pull request #5 from jackhumbert/masterAlex Johnstone
Sync with upstream
2016-04-05updates to noiseJack Humbert
2016-04-05Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert
2016-04-05add silent notesJack Humbert
2016-04-04Merge pull request #235 from mbarkhau/masterErez Zukerman
add indent to generated keymap
2016-04-03music mode fileJack Humbert
2016-04-03add indent to generated keymapManuel Barkhau
2016-04-03Merge pull request #213 from mbarkhau/masterErez Zukerman
Add manuneo layout
2016-04-03Merge pull request #234 from sboesebeck/masterErez Zukerman
several iterations later
2016-04-02use action function for unicodeManuel Barkhau
2016-04-02Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck
2016-04-02new keymapStephan Bösebeck
2016-04-01Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck
2016-04-01minor tweaks at the keymap, new png for documentationStephan Bösebeck
2016-04-01Merge pull request #233 from tak3over/patch-1Jack Humbert
Create tak3over.c
2016-04-01Create tak3over.ctak3over
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 Humbert
2016-04-01Merge pull request #226 from squisher/dvorak_intl_squisherErez Zukerman
Squisher's international dvorak variant for ergodox ez
2016-03-31fixed de_osx prefix in keymap include to avoid conflictsStephan Bösebeck
2016-03-31Merge pull request #230 from IBNobody/masterJack Humbert
Fixed Setup Script
2016-03-30Drastically rewrote the path script to handle Explorer's stubborn grasp of ↵IBNobody
EnvVars. Tested on Win7.
2016-03-30Also add compiled hex fileDavid Mohr
2016-03-30Squisher's international dvorak variant for ergodox ezDavid Mohr
See README.md
2016-03-30Merge pull request #229 from NoahAndrews/patch-5Jack Humbert
The readme was also wrong about the conflict between audio and RGB
2016-03-30Update README.mdNoah Andrews
2016-03-30Merge pull request #227 from NoahAndrews/patch-4Jack Humbert
Fixed minor issues with Preonic readme
2016-03-30Merge pull request #228 from mrfoto/fix-planck-diagramJack Humbert
Tiny fix of Planck diagrams
2016-03-30Tiny fix of Planck diagramsMiha Rekar
2016-03-30Fixed minor issues with Preonic readmeNoah Andrews
2016-03-30preonic readmeJack Humbert
2016-03-30Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert
2016-03-30.hex filesJack Humbert
2016-03-30preonic updateJack Humbert
2016-03-29Merge pull request #224 from NoahAndrews/make-keymap-names-consistentJack Humbert
Make keymap names more consistent
2016-03-29Updated several keyboard folders to use new keymap naming schemeNoah Andrews
2016-03-29Merge remote-tracking branch 'jackhumbert/master' into ↵Noah Andrews
make-keymap-names-consistent
2016-03-29Merge pull request #223 from NoahAndrews/patch-3Jack Humbert
Fix #198
2016-03-29Fix #198Noah Andrews
2016-03-29Update compile_keymap.pymbarkhau
2016-03-29Merge pull request #222 from NoahAndrews/patch-2Jack Humbert
Fix error in Planck makefile comment
2016-03-29Fix error in Planck makefile commentNoah Andrews
[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ösebeck
2016-03-29Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck
2016-03-28Merge pull request #219 from IBNobody/masterJack Humbert
Master
2016-03-28Merge pull request #220 from NoahAndrews/improve-buildguideJack Humbert
Added clarifying steps to Windows section of build guide
2016-03-28Added clarifying steps to Windows section of build guideNoah Andrews
2016-03-28Minor Tweaks and DocumentationIBNobody
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-28Merge remote-tracking branch 'jackhumbert/master' into improve-buildguideNoah Andrews