summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1327 from Dbroqua/masterJack Humbert2017-05-2610-18/+183
|\
| * - Added schematic for Trackpoint demonstrationdbroqua2017-05-262-0/+3
| * - Added integration of IBM Trackpointdbroqua2017-05-269-18/+180
| * Merge pull request #22 from qmk/masterDamien2017-05-26199-511/+3567
| |\
* | \ Merge pull request #1328 from yiancar/qmk_usb_startup_disableJack Humbert2017-05-262-7/+15
|\ \ \ | |_|/ |/| |
| * | Use variable to disable usb check at startupyiancar2017-05-262-7/+15
|/ /
* | Merge pull request #1316 from nikchi/masterJack Humbert2017-05-2410-3/+552
|\ \
| * | moved unicodemap rules to localer makeNick Choi2017-05-241-1/+0
| * | more emoji function commentsNick Choi2017-05-242-13/+38
| * | Tap dancing emoji support 😩😩Nick Choi2017-05-231-11/+64
| * | removed sNick Choi2017-05-231-2/+1
| * | Merge branch 'master' of https://github.com/nikchi/qmk_firmwareNick Choi2017-05-2318-64/+436
| |\ \
| | * \ Merge pull request #1 from qmk/masterNick Choi2017-05-2318-64/+436
| | |\ \
| * | | | preonic mapNick Choi2017-05-235-2/+255
| * | | | emojis and reorgNick Choi2017-05-151-28/+45
| |/ / /
| * | | emoji support butNick Choi2017-05-154-30/+78
| * | | change readmeNick Choi2017-05-151-1/+1
| * | | nikchi flakeNick Choi2017-05-154-0/+155
* | | | Merge pull request #1317 from qmk/hf/faster_mouseErez Zukerman2017-05-241-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | tweaks default mouse speed constantsErez Zukerman2017-05-241-2/+2
|/ / /
* | | Update readme.mdJack Humbert2017-05-201-1/+1
* | | Update readme.mdJack Humbert2017-05-201-23/+12
* | | Workaround for the macOS caps lock delay (#1308)jerryen2017-05-192-10/+4
* | | m10a lowercaseJack Humbert2017-05-187-2/+2
* | | Merge pull request #1303 from cwesterlund/dvorak_dev_sweErez Zukerman2017-05-182-0/+359
|\ \ \
| * | | Created a dvorak keymap for Swedish developers using Visual StudioChristian Westerlund2017-05-162-0/+359
* | | | ESC/GRAVE/TILDE better handling (#1307)tengg2017-05-171-14/+7
* | | | update travis scriptJack Humbert2017-05-172-7/+7
* | | | Increase TAPPING_TERM for the ClueboardskullY2017-05-161-0/+10
* | | | Make KC_GRV accessibleskullY2017-05-162-2/+2
|/ / /
* | | Merge pull request #1298 from barrar/masterJack Humbert2017-05-152-16/+43
|\ \ \ | |/ / |/| |
| * | added comments and made function name clearerJeremiah2017-05-141-13/+18
| * | whoopsJeremiah2017-05-141-2/+2
| * | faster, less bits :)Jeremiah2017-05-141-9/+2
| * | faster and less bits... againJeremiah2017-05-131-6/+5
| * | faster and less bitsJeremiah2017-05-131-18/+15
| * | should be using matrix_row_tJeremiah2017-05-131-3/+3
| * | a bit smallerJeremiah2017-05-131-6/+6
| * | a bit smallerJeremiah2017-05-131-18/+35
| * | improvementsJeremiah2017-05-132-24/+16
| * | anti-ghost improvement for older keyboards with empty spots in matrixJeremiah2017-05-132-7/+31
| * | Merge pull request #1 from qmk/masterbarrar2017-05-1378-230/+932
| |\ \
* | | | Updates readme.mdJack Humbert2017-05-131-5/+8
| |/ / |/| |
* | | Merge pull request #1297 from khogeland/satan-colemakJack Humbert2017-05-123-0/+120
|\ \ \
| * | | Colemak layout GH60 SatanKevin Hogeland2017-05-123-0/+120
* | | | Merge pull request #1291 from adzenith/persistentJack Humbert2017-05-1258-198/+198
|\ \ \ \ | |/ / / |/| | |
| * | | Fix spelling of "persistent"Nikolaus Wittenstein2017-05-1158-198/+198
|/ / /
* | | Merge pull request #1283 from TerryMathews/masterJack Humbert2017-05-1111-0/+544
|\ \ \
| * | | Fix compile errorTerryMathews2017-05-071-0/+2
| * | | Establish support for Bathroom Epiphanies Tiger Lily controllerTerryMathews2017-05-0711-0/+542