summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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
2016-03-28Refactor compiler codeManuel Barkhau3-1661/+1900
2016-03-28Added command to turn LED indicators off while sleepingIBNobody1-1/+4
2016-03-28Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck37-1306/+4820
2016-03-28Merge pull request #216 from msc654/masterErez Zukerman6-0/+1334
Added msc keymap for ergodox_ez
2016-03-28Merge pull request #214 from cdlm/action-hookJack Humbert6-21/+45
Add per-event user hook function
2016-03-28Merge pull request #217 from IBNobody/masterJack Humbert7-132/+488
Master
2016-03-28Merge pull request #218 from awpr/patch-1Jack Humbert1-3/+3
Add avr-libc to the Debian build dependencies.
2016-03-28Add avr-libc to the Debian build dependencies.Andrew Pritchard1-3/+3
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 Johnstone1-1139/+1138
2016-03-28££££Alex Johnstone1-1/+1
2016-03-28Forgot to change ent/spcAlex Johnstone1-693/+697
2016-03-28Add action-preprocessing kb/user hooks in planckDamien Pollet2-15/+18
2016-03-28Add action-preprocessing hook to keyboard templateDamien Pollet2-6/+19
2016-03-28Rename function to be keyboard-specificDamien Pollet2-4/+4
2016-03-28Add per-event user hook function to QMKDamien Pollet2-0/+8
2016-03-28Didn'tAlex Johnstone1-2/+2
2016-03-28Corrected duplicate image issueMatthew Carroll1-0/+0
2016-03-28Update the memory consumption total value in READMEWojciech Siewierski1-1/+1
2016-03-28Magic Key Overrides / Keyboard Lock / Forced NKROIBNobody7-132/+488
Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock option to template / Added forced NKRO option to template (disabled by default)
2016-03-28Added msc keymap for ergodox_ezMatthew Carroll6-0/+1334
2016-03-28Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯Alex Johnstone1-6/+45