summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2016-03-28add hex fileManuel Barkhau
2016-03-28Merge remote-tracking branch 'origin/master'Manuel Barkhau
2016-03-28Refactor compiler codeManuel Barkhau
2016-03-28Added command to turn LED indicators off while sleepingIBNobody
2016-03-28Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck
2016-03-28Merge pull request #216 from msc654/masterErez Zukerman
Added msc keymap for ergodox_ez
2016-03-28Merge pull request #214 from cdlm/action-hookJack Humbert
Add per-event user hook function
2016-03-28Merge pull request #217 from IBNobody/masterJack Humbert
Master
2016-03-28Merge pull request #218 from awpr/patch-1Jack Humbert
Add avr-libc to the Debian build dependencies.
2016-03-28Add avr-libc to the Debian build dependencies.Andrew Pritchard
Without avr-libc the build fails trying to #include_next a header from the standard library, which of course doesn't exist.
2016-03-28Updated hexAlex Johnstone
2016-03-28££££Alex Johnstone
2016-03-28Forgot to change ent/spcAlex Johnstone
2016-03-28Add action-preprocessing kb/user hooks in planckDamien Pollet
2016-03-28Add action-preprocessing hook to keyboard templateDamien Pollet
2016-03-28Rename function to be keyboard-specificDamien Pollet
2016-03-28Add per-event user hook function to QMKDamien Pollet
2016-03-28Didn'tAlex Johnstone
2016-03-28Corrected duplicate image issueMatthew Carroll
2016-03-28Update the memory consumption total value in READMEWojciech Siewierski
2016-03-28Magic Key Overrides / Keyboard Lock / Forced NKROIBNobody
Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock option to template / Added forced NKRO option to template (disabled by default)
2016-03-27Added msc keymap for ergodox_ezMatthew Carroll
2016-03-27Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯Alex Johnstone
2016-03-27Merge pull request #4 from jackhumbert/masterAlex Johnstone
upstream
2016-03-27Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯Alex Johnstone
2016-03-27The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene
2016-03-28Update the memory consumption of PREVENT_STUCK_MODIFIERS in READMEWojciech Siewierski