summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* race condition between oneshot_mods and tap_danceSjB2017-01-292-1/+7
* Merge pull request #1043 from potz/patch-1skullydazed2017-01-271-0/+16
|\
| * Clarify license on abnt2 keymap (#1038)Potiguar Faga2017-01-271-0/+16
|/
* Merge pull request #869 from dylanjgscott/masterJack Humbert2017-01-271-2/+2
|\
| * Compare Makefile with itself instead of using `--help`Dylan Scott2017-01-241-2/+2
* | Merge pull request #1035 from qmk/qmk_org_changesJack Humbert2017-01-2716-22/+22
|\ \
| * | replace jackhumbert with qmkJack Humbert2017-01-2616-22/+22
|/ /
* | Merge pull request #1029 from SjB/qmk_infinity60Jack Humbert2017-01-265-0/+46
|\ \
| * | updated all the other keymaps to support the new changes.SjB2017-01-243-0/+28
| * | fix: infinity60 keyboard was not using quantum features.SjB2017-01-232-0/+18
* | | Merge pull request #1033 from smt/smt/preonicJack Humbert2017-01-263-0/+335
|\ \ \
| * | | Remove COLEMAK from preonic_keycodes enumStephen Tudor2017-01-251-1/+0
| * | | Update readme for smt Preonic keymapStephen Tudor2017-01-251-1/+85
| * | | Add smt keymap for PreonicStephen Tudor2017-01-253-0/+252
* | | | Add gitter image, start update to qmk orgJack Humbert2017-01-261-3/+3
* | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert2017-01-253-3/+66
|\| | |
| * | | Merge pull request #1014 from SjB/lcd_mods_statusJack Humbert2017-01-243-3/+66
| |\ \ \ | | |/ / | |/| |
| | * | added mods status bit to visualizer.SjB2017-01-173-3/+66
* | | | layer defines to enumJack Humbert2017-01-252-13/+19
|/ / /
* | | turn off rgb_midi in ezJack Humbert2017-01-233-5/+6
* | | Merge pull request #1026 from TerryMathews/masterJack Humbert2017-01-232-23/+0
|\ \ \
| * | | More code cleanupTerryMathews2017-01-222-23/+0
* | | | Merge pull request #1018 from hot-leaf-juice/masterJack Humbert2017-01-222-44/+19
|\ \ \ \
| * | | | simplifyCallum Oakley2017-01-202-44/+19
* | | | | More keyboard map tweaking (#1019)Christopher Browne2017-01-222-6/+6
* | | | | Merge pull request #1020 from remigius42/masterJack Humbert2017-01-226-0/+1157
|\ \ \ \ \
| * | | | | SG Ergodox layout: Updated layout documentationAndreas Schmidt2017-01-223-4/+12
| * | | | | SG Ergodox layout: Fixed ENTER key mappingAndreas Schmidt2017-01-221-2/+2
| * | | | | SG Ergodox layout: Minor code formatting changesAndreas Schmidt2017-01-221-1/+1
| * | | | | SG Ergodox layout: Add ENTER to left keyboardAndreas Schmidt2017-01-221-2/+2
| * | | | | SG Ergodox layout: Add <br/> macro to media layerAndreas Schmidt2017-01-221-2/+14
| * | | | | Renamed JSON source of Ergodox Swiss GermanAndreas Schmidt2017-01-212-1/+1
| * | | | | Correct layout description of ergodox swissgermanAndreas Schmidt2017-01-212-15/+16
| * | | | | Removed Ergodox EZ & Infinity specific keymapsAndreas Schmidt2017-01-2112-2233/+0
| * | | | | Merged keymap for Ergodox EZ & InfinityAndreas Schmidt2017-01-216-0/+1136
| * | | | | Add Swiss German layout for Ergodox InfinityAndreas Schmidt2017-01-216-0/+1112
| * | | | | Add Swiss German layout for Ergodox EZAndreas Schmidt2017-01-216-0/+1121
| |/ / / /
* | | | | Merge pull request #1022 from lucwastiaux/masterJack Humbert2017-01-222-13/+48
|\ \ \ \ \
| * | | | | document BRACKETS and SHELL_LAYERlucwastiaux2017-01-221-1/+6
| * | | | | make shell layer more compatible with default layerlucwastiaux2017-01-211-15/+16
| * | | | | couple of changes to the shell layerlucwastiaux2017-01-211-4/+4
| * | | | | introduce shell_layerlucwastiaux2017-01-191-3/+31
| * | | | | put shell nav under tab, introduce an OSL for the brackets layerlucwastiaux2017-01-171-4/+5
| * | | | | enable brackets using the - key on the right, and cleanupslucwastiaux2016-12-151-8/+8
* | | | | | Merge pull request #1021 from luizribeiro/ps2avrGBJack Humbert2017-01-2219-18/+877
|\ \ \ \ \ \
| * | | | | | Upgrade AVR 8-bit Toolchain to 3.5.4 on TravisLuiz Ribeiro2017-01-221-3/+7
| * | | | | | Added a copyright header to the default keymap... ¯\_(ツ)_/¯Luiz Ribeiro2017-01-212-0/+18
| * | | | | | Slightly saner default keymap for ps2avrGB and removed some unused codeLuiz Ribeiro2017-01-212-27/+4
| * | | | | | Simplified and polished a bit the code changes on tmk_coreLuiz Ribeiro2017-01-215-7/+8
| * | | | | | Simplification and code polish on ps2avrGB directoryLuiz Ribeiro2017-01-214-37/+27