summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-01-27Merge pull request #869 from dylanjgscott/masterJack Humbert1-2/+2
2017-01-27Merge pull request #1035 from qmk/qmk_org_changesJack Humbert16-22/+22
2017-01-26replace jackhumbert with qmkJack Humbert16-22/+22
2017-01-26Merge pull request #1029 from SjB/qmk_infinity60Jack Humbert5-0/+46
2017-01-26Merge pull request #1033 from smt/smt/preonicJack Humbert3-0/+335
2017-01-26Add gitter image, start update to qmk orgJack Humbert1-3/+3
2017-01-25Remove COLEMAK from preonic_keycodes enumStephen Tudor1-1/+0
2017-01-25Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert3-3/+66
2017-01-25layer defines to enumJack Humbert2-13/+19
2017-01-25Update readme for smt Preonic keymapStephen Tudor1-1/+85
2017-01-25Add smt keymap for PreonicStephen Tudor3-0/+252
2017-01-24Merge pull request #1014 from SjB/lcd_mods_statusJack Humbert3-3/+66
2017-01-24updated all the other keymaps to support the new changes.SjB3-0/+28
2017-01-24fix: infinity60 keyboard was not using quantum features.SjB2-0/+18
2017-01-24Compare Makefile with itself instead of using `--help`Dylan Scott1-2/+2
2017-01-23turn off rgb_midi in ezJack Humbert3-5/+6
2017-01-23Merge pull request #1026 from TerryMathews/masterJack Humbert2-23/+0
2017-01-23More code cleanupTerryMathews2-23/+0
2017-01-23Merge pull request #1018 from hot-leaf-juice/masterJack Humbert2-44/+19
2017-01-23More keyboard map tweaking (#1019)Christopher Browne2-6/+6
2017-01-23Merge pull request #1020 from remigius42/masterJack Humbert6-0/+1157
2017-01-23Merge pull request #1022 from lucwastiaux/masterJack Humbert2-13/+48
2017-01-23Merge pull request #1021 from luizribeiro/ps2avrGBJack Humbert19-18/+877
2017-01-23Merge pull request #1023 from TerryMathews/masterJack Humbert7-400/+23
2017-01-22Missed commenting out notes at end of lineTerryMathews2-2/+2
2017-01-22Fixed keymap matrix on rev2TerryMathews1-4/+4
2017-01-22Created lines to uncomment keyboards built upside downTerryMathews2-0/+3
2017-01-22Refactor code to eliminate duplicate definesTerryMathews6-396/+16
2017-01-22Upgrade AVR 8-bit Toolchain to 3.5.4 on TravisLuiz Ribeiro1-3/+7
2017-01-22SG Ergodox layout: Updated layout documentationAndreas Schmidt3-4/+12
2017-01-22SG Ergodox layout: Fixed ENTER key mappingAndreas Schmidt1-2/+2
2017-01-22SG Ergodox layout: Minor code formatting changesAndreas Schmidt1-1/+1
2017-01-22SG Ergodox layout: Add ENTER to left keyboardAndreas Schmidt1-2/+2
2017-01-22SG Ergodox layout: Add <br/> macro to media layerAndreas Schmidt1-2/+14
2017-01-22document BRACKETS and SHELL_LAYERlucwastiaux1-1/+6
2017-01-22Added a copyright header to the default keymap... ¯\_(ツ)_/¯Luiz Ribeiro2-0/+18
2017-01-22Slightly saner default keymap for ps2avrGB and removed some unused codeLuiz Ribeiro2-27/+4
2017-01-21Simplified and polished a bit the code changes on tmk_coreLuiz Ribeiro5-7/+8
2017-01-21Renamed JSON source of Ergodox Swiss GermanAndreas Schmidt2-1/+1
2017-01-21Correct layout description of ergodox swissgermanAndreas Schmidt2-15/+16
2017-01-21Removed Ergodox EZ & Infinity specific keymapsAndreas Schmidt12-2233/+0
2017-01-21Merged keymap for Ergodox EZ & InfinityAndreas Schmidt6-0/+1136
2017-01-21Simplification and code polish on ps2avrGB directoryLuiz Ribeiro4-37/+27
2017-01-21Got ps2avrGB to work with the V-USB protocolLuiz Ribeiro19-17/+886
2017-01-21make shell layer more compatible with default layerlucwastiaux1-15/+16
2017-01-21Add Swiss German layout for Ergodox InfinityAndreas Schmidt6-0/+1112
2017-01-21Add Swiss German layout for Ergodox EZAndreas Schmidt6-0/+1121
2017-01-21couple of changes to the shell layerlucwastiaux1-4/+4
2017-01-20simplifyCallum Oakley2-44/+19
2017-01-19introduce shell_layerlucwastiaux1-3/+31