summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-11-17Merge https://github.com/climbalima/qmk_firmwareclimbalima14-29/+278
2016-11-17Updated my repo to current qmkclimbalima25-98/+756
2016-11-15fixed conflictclimbalima1-3/+0
2016-11-15fixed extra pasteclimbalima1-3/+2
2016-11-11Merge branch 'master' of https://github.com/climbalima/qmk_firmwareclimbalima1-2/+19
2016-11-11Added both revisions into one folderclimbalima11-101/+327
2016-11-11Merge pull request #868 from potz/masterJack Humbert1-0/+58
2016-11-11returned to oclimbalima1-4/+4
2016-11-11 Changes to be committed:climbalima29-68/+2119
2016-11-10Merge pull request #870 from NoahAndrews/patch-1Erez Zukerman1-1/+1
2016-11-09Add proper shortcode for KC_DELETE to keycode.txtNoah Andrews1-1/+1
2016-11-08Add brazilian ABNT2 keymapPotiguar Faga1-0/+58
2016-11-07Merge pull request #867 from fredizzimo/variable_traceJack Humbert4-0/+175
2016-11-07Merge pull request #852 from J3RN/remove-z-slash-controlsJack Humbert1-3/+3
2016-11-06Add documentation for the variable tracingFred Sundvik2-0/+32
2016-11-06Add possibility to control variable trace from makeFred Sundvik3-5/+38
2016-11-06Add variable traceFred Sundvik2-0/+110
2016-11-06Removed the control action when holding z or /Jonathan Arnett1-3/+3
2016-11-01Implements dedicated text zoom keysErez Zukerman2-3/+7
2016-11-01Merge pull request #851 from J3RN/momentaryErez Zukerman1-5/+5
2016-11-01Merge pull request #843 from lucwastiaux/masterErez Zukerman4-1/+428
2016-11-01Merge pull request #836 from 20lives/masterErez Zukerman7-472/+695
2016-10-30Merge pull request #839 from priyadi/planck-priyadi-modificationJack Humbert2-58/+98
2016-10-30Merge pull request #854 from slebedev/masterJack Humbert1-1/+1
2016-10-30Merge pull request #857 from fredizzimo/fix_makefile_too_long_bashJack Humbert1-8/+23
2016-10-30Run each sumbmake in a separate shellFred Sundvik1-8/+23
2016-10-29Add link to article about Unicode Hex Input in readmeSergey Lebedev1-1/+1
2016-10-26re-introduce brackets layerlucwastiaux1-2/+24
2016-10-26Merge pull request #827 from Dbroqua/masterJack Humbert3-6/+88
2016-10-26Merge pull request #849 from hot-leaf-juice/masterJack Humbert1-4/+4
2016-10-26Merge pull request #848 from andrebeat/fix-dockerfileJack Humbert1-1/+2
2016-10-26Merge pull request #847 from yinshanyang/masterJack Humbert1-0/+13
2016-10-26Merge pull request #844 from priyadi/unicode_wincompose_inputJack Humbert2-4/+10
2016-10-26Merge pull request #842 from priyadi/unicode_map_lengthJack Humbert2-9/+35
2016-10-26Merge pull request #841 from jacwib/masterJack Humbert3-27/+118
2016-10-26Merge pull request #831 from kejadlen/masterJack Humbert5-0/+261
2016-10-26Merge pull request #834 from kazufukurou/masterJack Humbert1-0/+82
2016-10-25[alphadox] remove tmk reset codeAlpha Chen2-10/+0
2016-10-25[ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interruptAlpha Chen1-0/+3
2016-10-25add alphadox layouts to atreus and ergodoxAlpha Chen5-0/+268
2016-10-25replace lock key with general power keyCallum Oakley1-2/+2
2016-10-25switched to standard volume keysCallum Oakley1-2/+2
2016-10-24add subproject env var to dockerfileAndre Silva1-1/+2
2016-10-24added notes on using Arduino Pro Micro 3.3V with Let’s SplitYin Shanyang1-0/+13
2016-10-23merge upstreamLior Haim23-21/+1360
2016-10-231.2 updatejacwib3-20/+105
2016-10-23Use WinCompose unicode input method instead of HexNumpadPriyadi Iman Nurcahyo1-1/+1
2016-10-23Unicode WinCompose input methodPriyadi Iman Nurcahyo2-4/+10
2016-10-23adding readmelucwastiaux1-0/+15
2016-10-23UNICODE_MAP: remove 5 char limit; ignore leading zeroes; handle OS limitationsPriyadi Iman Nurcahyo2-9/+35