summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-03-28Merge pull request #4 from jackhumbert/masterAlex Johnstone17-1149/+2945
upstream
2016-03-28Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯Alex Johnstone2-1140/+1198
2016-03-27Merge pull request #188 from DidierLoiseau/issue-156Erez Zukerman4-2/+23
Fix #156: clear weak mods on every key press
2016-03-27Merge pull request #211 from nrrkeene/masterErez Zukerman10-1147/+1232
The Ordinary Layout is unremarkably mundane and remarkably useful
2016-03-27Merge pull request #196 from naps62/naps62Erez Zukerman3-0/+1690
Adds naps62's Ergodox EZ layout
2016-03-26Merge https://github.com/jackhumbert/qmk_firmwareNicholas Keene1-1/+5
2016-03-26The Ordinary Layout is unremarkably mundane and remarkably usefulNicholas Keene10-1109/+1192
2016-03-25Merge pull request #3 from jackhumbert/masterAlex Johnstone99-41470/+33848
Pull upstream
2016-03-25Merge pull request #207 from romanzolotarev/masterErez Zukerman1-1/+5
Add important note about brightness on OS X
2016-03-25The Ordinary Layout is familiar to users of common keyboardsNicholas Keene1-58/+60
2016-03-24New :pound: methodAlex Johnstone1-1/+1
2016-03-24New :pound: methodAlex Johnstone1-1/+2
2016-03-24New :pound: methodAlex Johnstone1-2/+2
2016-03-24New :pound: methodAlex Johnstone1-0/+5
2016-03-24New :pound: methodAlex Johnstone2-1135/+1131
2016-03-23Wrong dateAlex Johnstone1-1/+1
2016-03-23Merge pull request #210 from n0bs/masterJack Humbert2-16/+12
Edited Bantam44 to work with jackhumbert/qmk_firmware pull #190
2016-03-23Edited to work with jackhumbert/qmk_firmware pull #190Norberto Monarrez2-16/+12
Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"
2016-03-23Merge pull request #209 from n0bs/masterJack Humbert6-0/+332
Added project folder for Bantam-44
2016-03-23Merge pull request #200 from alexives/add_diagram_to_planck_layoutJack Humbert1-5/+65
Added layout diagrams to the default planck keymap
2016-03-23Added files for Bantam-44Norberto Monarrez6-0/+332
2016-03-23Removed whitespaceAlex Johnstone1-55/+54
2016-03-23Revised to version 0.1.0Alex Johnstone4-979/+1010
2016-03-23Merge pull request #199 from IBNobody/masterJack Humbert11-6/+420
Added LED Indicator Support to QMK Template
2016-03-23Fixed extra semicolons.IBNobody2-9/+6
Fixed extra semicolons.
2016-03-23Fixed LED Function CallsIBNobody4-34/+22
Fixed LED indicator function calls to match how the matrix init function calls are formatted.
2016-03-23Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody88-41597/+34428
# Conflicts: # quantum/template/template.c # quantum/template/template.h
2016-03-22Merge pull request #190 from yoyoerx/function_pointersErez Zukerman82-41462/+33034
Addressing void* return warning & coding style
2016-03-22Merge pull request #2 from jackhumbert/masterAlex Johnstone14-2732/+4307
Update my repo to upstream
2016-03-22Meh -> HyperAlex Johnstone1-1/+1
2016-03-22Update readme.mdAlex Johnstone1-1/+1
2016-03-22Added photoAlex Johnstone1-1/+1
2016-03-22Added real life layoutAlex Johnstone1-0/+0
2016-03-22Add important note about brightness on OS XRoman Zolotarev1-1/+5
2016-03-22Added ReadmeAlex Johnstone1-0/+111
2016-03-22added .hexAlex Johnstone1-0/+1124
2016-03-22typosAlex Johnstone1-2/+2
2016-03-22Update keymap.cAlex Johnstone1-6/+6
2016-03-22More updatesAlex Johnstone1-14/+15
2016-03-21Pull request 190 resolution with 'qmk/master' for mergeyoyoerx15-2579/+4317
2016-03-21Merge pull request #205 from romanzolotarev/masterErez Zukerman4-0/+1309
Add Roman's Layout
2016-03-21work in progressAlex Johnstone1-28/+28
2016-03-20Merge pull request #203 from XenoBits/masterErez Zukerman5-1227/+1174
Improved c# dev layout, only 2 layers now
2016-03-20Merge pull request #201 from uzytkownik/masterErez Zukerman2-1497/+1503
Further improvements to mpiechotka keyboard
2016-03-20Fixed png imageMaxime Millet1-0/+0
2016-03-20CSharp dev layout V2Maxime Millet5-1227/+1174
2016-03-19Update readmeRoman Zolotarev1-1/+1
2016-03-19Update layoutRoman Zolotarev12-192/+67
2016-03-18Swap volup and voldownRoman Zolotarev1-2/+2
2016-03-18Add Roman's LayoutRoman Zolotarev11-0/+1434
Four layers BASE (Norman), SYMB, PLVR (optimized for Plover), ARRW.