summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #880 from psyill/masterJack Humbert2016-11-166-0/+678
|\ | | | | Added keymap "videck", an ErgoDox keymap for Vi(m) users.
| * Added keymap "videck", an ErgoDox keymap for Vi(m) users.Hans EllegÄrd2016-11-136-0/+678
| |
* | Merge pull request #879 from sethbc/update_sethbc_ergodox_keymapJack Humbert2016-11-163-13/+3
|\ \ | | | | | | update sethbc ergodox keymap
| * | update sethbc ergodox keymapSeth Chandler2016-11-133-13/+3
| |/
* | Merge pull request #877 from sethbc/update_sethbc_satan_keymapJack Humbert2016-11-161-7/+7
|\ \ | | | | | | update sethbc keymap
| * | oops, fixed inverted if statementSeth Chandler2016-11-131-6/+6
| | |
| * | update sethbc keymapSeth Chandler2016-11-121-1/+1
| |/
* | Merge pull request #876 from Dbroqua/masterJack Humbert2016-11-163-1/+120
|\ \ | | | | | | Updated kc60/dbroqua layout and added satan/dbroqua_hhkb
| * | Merge pull request #12 from jackhumbert/masterDamien2016-11-127-4/+237
| |\| | | | | | | Merged from qmk
| * | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua2016-11-1218-548/+1257
| |\ \
| | * \ Merge pull request #11 from jackhumbert/masterDamien2016-11-0318-548/+1257
| | |\ \ | | | | | | | | | | Merged from jackhumbert
| * | | | - Added dbroqua_hhkb layout for Satan PCBdbroqua2016-11-122-0/+119
| |/ / /
| * | | - Fixed typo in gh60/dbroqua layoutdbroqua2016-10-261-1/+1
| | | |
| * | | Merge pull request #10 from jackhumbert/masterDamien2016-10-2656-235/+2562
| |\ \ \ | | | | | | | | | | Merge from jackhumbert/qmk_firmware
* | \ \ \ Merge pull request #866 from fredizzimo/infinity60_clockfixesJack Humbert2016-11-162-2/+7
|\ \ \ \ \ | | | | | | | | | | | | Increase the infinity60 system tick frequency
| * | | | | Increase the infinity60 system tick frequencyFred Sundvik2016-11-052-2/+7
| | | | | |
* | | | | | Merge pull request #860 from IBNobody/masterJack Humbert2016-11-167-226/+394
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Improved Quantum Matrix
| * | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-11-085-3/+178
| |\ \ \ \ \
| * | | | | | Adding SKIP_GIT to speed up compiles.IBNobody2016-11-011-18/+39
| | | | | | |
| * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-11-0115-76/+785
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | added fixed debounce codeIBNobody2016-10-291-73/+70
| | | | | | |
| * | | | | | Merge branch 'master' of https://github.com/IBNobody/qmk_firmwareIBNobody2016-10-29105-1181/+5745
| |\ \ \ \ \ \
| | * | | | | | Made scanning more efficientIBNobody2016-10-291-31/+24
| | | | | | | |
| | * | | | | | Refactoring Matrix scanningIBNobody2016-10-282-88/+95
| | | | | | | |
| | * | | | | | Fixing Debounce - WIPIBNobody2016-10-283-84/+174
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-2818-51/+613
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Fixing Line TerminationsIBNobody2016-10-233-472/+472
| | | | | | | |
| | * | | | | | Fixed some large keyboard bugsIBNobody2016-10-235-7/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some bugs relating to keyboards with more than 16 columns. Also added the ability to mask off keyboard matrix bits.
| | * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-2382-503/+4324
| | |\ \ \ \ \ \
| | * | | | | | | Updating Vision keyboard filesIBNobody2016-10-182-99/+116
| | | | | | | | |
| | * | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-030-0/+0
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-10-068-30/+313
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge pull request #868 from potz/masterJack Humbert2016-11-101-0/+58
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add brazilian ABNT2 keymap
| * | | | | | | | | | | Add brazilian ABNT2 keymapPotiguar Faga2016-11-081-0/+58
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #870 from NoahAndrews/patch-1Erez Zukerman2016-11-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | Add proper shortcode for KC_DELETE to keycode.txt
| * | | | | | | | | | | Add proper shortcode for KC_DELETE to keycode.txtNoah Andrews2016-11-081-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #867 from fredizzimo/variable_traceJack Humbert2016-11-074-0/+175
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Variable trace
| * | | | | | | | | | | Add documentation for the variable tracingFred Sundvik2016-11-062-0/+32
| | | | | | | | | | | |
| * | | | | | | | | | | Add possibility to control variable trace from makeFred Sundvik2016-11-063-5/+38
| | | | | | | | | | | |
| * | | | | | | | | | | Add variable traceFred Sundvik2016-11-062-0/+110
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For debugging changes to variables, either normally or as a result of a memory corruption.
* | | | | | | | | | | Merge pull request #852 from J3RN/remove-z-slash-controlsJack Humbert2016-11-071-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Removed the control action when holding z or /
| * | | | | | | | | | Removed the control action when holding z or /Jonathan Arnett2016-11-061-3/+3
|/ / / / / / / / / /
* | | | | | | | | | Implements dedicated text zoom keysErez Zukerman2016-11-012-3/+7
| | | | | | | | | |
* | | | | | | | | | Merge pull request #851 from J3RN/momentaryErez Zukerman2016-10-311-5/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Switched to momentary
| * | | | | | | | | | Switched to momentaryJonathan Arnett2016-10-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updated the style of these lines slightly to match the style of the default keymap
* | | | | | | | | | | Merge pull request #843 from lucwastiaux/masterErez Zukerman2016-10-314-1/+428
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adding Ergodox Dvorak Programmer layout
| * | | | | | | | | | | re-introduce brackets layerlucwastiaux2016-10-261-2/+24
| | | | | | | | | | | |
| * | | | | | | | | | | adding readmelucwastiaux2016-10-231-0/+15
| | | | | | | | | | | |
| * | | | | | | | | | | add up/down keys on thumb clusterslucwastiaux2016-10-231-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | remove brackets layer, replace a few shortcuts on thumb clusterlucwastiaux2016-10-231-30/+13
| | | | | | | | | | | |