summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-10-23Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChris Browne
2016-10-23Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne
2016-10-20Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-10-20Merge pull request #833 from h-parks/masterErez Zukerman
2016-10-20Merge pull request #832 from PhoenixRion/masterErez Zukerman
2016-10-19Win10 Writer's Block - An ErgoDox Keymaph-parks
2016-10-18Win10 Writer's Block - An ErgoDox Keymaph-parks
2016-10-18Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-10-18update header fileRyan Ascheman
2016-10-18didn't read PR comment close enough, correcting folderRyan Ascheman
2016-10-18moving keymap to new locationRyan Ascheman
2016-10-18Merge remote-tracking branch 'upstream/master'Ryan Ascheman
2016-10-18Merge pull request #829 from r2d2rogers/masterJack Humbert
2016-10-18Merge pull request #824 from dsvensson/pegasushoofJack Humbert
2016-10-18Update ez.cRob Rogers
2016-10-18Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareJack Humbert
2016-10-18removes planck/rev3 temporarilyJack Humbert
2016-10-17Merge pull request #826 from algernon/ergodox-ez/algernonErez Zukerman
2016-10-17Merge branch 'master' of github.com:cbbrowne/qmk_firmwarecbbrowne
2016-10-17Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-10-17Move hand_swap_config to ez.c, removes error for infinityRob Rogers
2016-10-16Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne
2016-10-16Update MakefileJack Humbert
2016-10-16Merge pull request #815 from priyadi/unicode_mapJack Humbert
2016-10-16Merge pull request #825 from replicaJunction/pr-vscodeJack Humbert
2016-10-16ergodox: Update algernon's keymap to v1.9Gergely Nagy
2016-10-15Added VS Code dir to .gitignoreJoshua T
2016-10-13Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-10-13Support the Pegasus Hoof controller.Daniel Svensson
2016-10-13Merge pull request #818 from pvinis/pvinis-keymapErez Zukerman
2016-10-13Merge pull request #822 from jackhumbert/hotfix/simplify_toErez Zukerman
2016-10-12[Jack & Erez] Simplifies and documents TOJack & Erez
2016-10-12I keep mis-using UPPER|LOWER/SLASH, and getting RESET.cbbrowne
2016-10-12Merge branch 'master' of github.com:cbbrowne/qmk_firmwarecbbrowne
2016-10-11add readmePavlos Vinieratos
2016-10-11use wait_ms instead of _delay_msPavlos Vinieratos
2016-10-11add messengerPavlos Vinieratos
2016-10-11init keymapPavlos Vinieratos
2016-10-10Merge pull request #803 from coderkun/coderkun_neo2Erez Zukerman
2016-10-10Merge pull request #809 from nathanejohnson/osx_whiskey_tango_foxtrot_capslockErez Zukerman
2016-10-10Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne
2016-10-10Merge branch 'master' of github.com:cbbrowne/qmk_firmwareChris Browne
2016-10-10Merge pull request #808 from npoirey/masterJack Humbert
2016-10-10Merge pull request #811 from Vifon/planck_keymap_vifonJack Humbert
2016-10-10Merge pull request #810 from Vifon/dynamic_macrosJack Humbert
2016-10-10Merge pull request #814 from fredizzimo/rgb_tuningJack Humbert
2016-10-10Merge pull request #813 from fredizzimo/add_cluecard_rgb_effectsJack Humbert
2016-10-10Add example keymapPriyadi Iman Nurcahyo
2016-10-09Adding whiskey_tango_foxtrot_capslock ergodox keymapNathan Johnson
2016-10-10Unicode map framework. Allow unicode up to 0xFFFFF using separatePriyadi Iman Nurcahyo