summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-09-11Fixed compilation issues after the mergeDidier Loiseau2-2/+2
2016-09-11Merge remote-tracking branch 'remotes/jackhumbert/master' into bépoDidier Loiseau6844-2409527/+100284
2016-09-11Added KC_APP on fn+BP_AGRVDidier Loiseau1-2/+2
2016-09-09Merge pull request #715 from profet23/masterJack Humbert4-0/+234
2016-09-09Changing keymap name to "profet_80"profet233-0/+0
2016-09-08Merge pull request #739 from pondrejk/masterJack Humbert1-0/+0
2016-09-08Merge pull request #737 from pondrejk/patch-1Jack Humbert1-1/+1
2016-09-08Merge pull request #736 from tong92/masterJack Humbert3-0/+274
2016-09-08Merge pull request #735 from romanzolotarev/patch-1Jack Humbert1-1/+1
2016-09-08Merge pull request #733 from cbbrowne/masterJack Humbert3-15/+38
2016-09-08Merge pull request #730 from IBNobody/masterJack Humbert23-120/+303
2016-09-08util/install_dependencies.sh made executable, fixes #738Peter Ondrejka1-0/+0
2016-09-08fixed typo in Linux install instructionsPeter Ondrejka1-1/+1
2016-09-08add tong92 keymaptong923-0/+274
2016-09-08Fix typoRoman Zolotarev1-1/+1
2016-09-08Added User Print - A "light" console out option (#8)IBNobody6-26/+166
2016-09-07Borrowed joint Shift/Enter idea from sgoodwin mappingcbbrowne2-1/+2
2016-09-07Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne51-823/+2846
2016-09-07Use keyboard config for nkro (#7)IBNobody17-101/+131
2016-09-07Removing separate ergodox80 project.profet2321-1930/+55
2016-09-07Merge pull request #732 from romanzolotarev/masterErez Zukerman2-27/+40
2016-09-07Merge pull request #729 from joarau/masterErez Zukerman6-0/+420
2016-09-07Change CTL_T(KC_ESC) to KC_LCTRL and update readmeRoman Zolotarev2-27/+40
2016-09-07Merge pull request #6 from IBNobody/fix_magic_key_binding_NKROIBNobody1-0/+13
2016-09-07Set keyboard_nkro (used by TMK) w/ MAGIC_HOST_NKROIBNobody1-0/+13
2016-09-06Merge pull request #5 from IBNobody/make_nkro_report_32_bytesIBNobody1-6/+6
2016-09-06Change NKRO size fron 16 bytes to 32 bytes.IBNobody1-6/+6
2016-09-06Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody30-553/+1624
2016-09-06norwegian programmer-friendly layoutjoar6-0/+420
2016-09-06Merge pull request #728 from fitzsim/yoruianErez Zukerman6-0/+277
2016-09-06Fix ergodox_yoruian XKB namingThomas Fitzsimmons2-2/+2
2016-09-06Add new ErgoDox EZ keymap, YORUIANThomas Fitzsimmons6-0/+277
2016-09-06Merge pull request #686 from coderkun/coderkun_neo2Erez Zukerman2-7/+19
2016-09-06Merge pull request #678 from algernon/ergodox-ez/algernonErez Zukerman8-523/+552
2016-09-05Merge pull request #724 from sgoodwin/masterJack Humbert3-0/+268
2016-09-05Merge pull request #722 from fredizzimo/fix_always_linkingJack Humbert1-2/+4
2016-09-05Merge pull request #719 from IBNobody/masterJack Humbert3-221/+319
2016-09-05Merge pull request #716 from MajorKoos/masterJack Humbert7-0/+474
2016-09-05Merge pull request #711 from hot-leaf-juice/masterJack Humbert2-19/+27
2016-09-05Merge pull request #710 from algernon/h/tap-dance/keyup-seq-start-fixJack Humbert1-2/+3
2016-09-05Add my keymap.Samuel Ryan Goodwin3-0/+268
2016-09-04Fix the ldflags.txt and obj.txt checksFred Sundvik1-2/+4
2016-09-04Merge pull request #4 from IBNobody/update_atomic_planck_pvc_keymapsIBNobody2-199/+238
2016-09-04Added diagonal mice macros, breathing ala AtomicIBNobody2-199/+238
2016-09-04Moved breathing backlighting section in readme.mdIBNobody1-60/+60
2016-09-04Updated doc to contain breathing information.IBNobody1-29/+144
2016-09-04Updated readme to have better backlight breathing info.IBNobody1-160/+104
2016-09-03Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody10-22/+443
2016-09-03Add rules.mk fileMajor Koos1-0/+69
2016-09-03Add support for JD40 MKII PCBMajor Koos6-0/+405