summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Added Ctrl+` (ConEmu shortcut)Joshua T2016-10-151-1/+1
| * | | | | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-10-15154-2157/+9342
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Joshua T2016-09-01182-6034/+9444
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Fixed getting "stuck" in gaming layerJoshua T2016-08-241-1/+1
| * | | | | | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-08-24168-1634/+12955
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Several key placement fixes.Joshua T2016-08-248-11/+21
| * | | | | | | | | | Minor changes to Extend and Number layers.Joshua T2016-08-163-10/+10
| * | | | | | | | | | Moved Shift keys to Z and ?Joshua T2016-08-091-9/+9
| * | | | | | | | | | Merged branch master into masterJoshua T2016-08-0925-166/+1489
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Changed left thumb back to Ctrl/AltJoshua T2016-08-091-11/+8
| * | | | | | | | | | Created keymap-specific config.hJoshua T2016-08-091-0/+63
| * | | | | | | | | | Reverted Ergodox config.hJoshua T2016-08-091-1/+1
| * | | | | | | | | | Created keymap local config.h fileJoshua T2016-08-092-4/+95
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-08-0724-199/+2015
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Moved PREVENT_STUCK_MODIFIERS to config.hJoshua T2016-07-302-3/+3
| * | | | | | | | | | | Moved my Ergodox keymap to match upstream changesJoshua T2016-07-302-8/+10
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-07-30234-1700/+2992
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Joshua T2016-07-2676-324/+6517
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Modified Atreus extend and Ergodox.Joshua T2016-07-265-179/+151
| * | | | | | | | | | | | | Created readme and added screenshotsJoshua T2016-07-206-15/+74
| * | | | | | | | | | | | | Modified Atreus layout to account for keymap() functionJoshua T2016-07-191-30/+30
| * | | | | | | | | | | | | Adjusted Atreus KEYMAP() function.Joshua T2016-07-191-5/+5
| * | | | | | | | | | | | | Added Gaming layer and removed DvorakJoshua T2016-07-191-23/+23
| * | | | | | | | | | | | | Added default layer switch QWERTY to ColemakJoshua T2016-07-151-3/+5
| * | | | | | | | | | | | | Fixed a merge conflictJoshua T2016-07-151-9/+0
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-07-152-0/+213
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Corrected merge conflictJoshua T2016-07-131-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Created replicaJunction keymaps.Joshua T2016-07-112-0/+489
| * | | | | | | | | | | | | | | Created replicaJunction keymaps.Joshua T2016-07-132-0/+503
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Usaility changes to keymap, tidying up a bit.xyverz2017-01-081-12/+12
* | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'xyverz2016-12-1317-52/+520
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #948 from climbalima/masterJack Humbert2016-12-1211-9/+438
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | svg bug fix and added pilcrow to hand wireclimbalima2016-12-1211-9/+438
| * | | | | | | | | | | | | re-enable audio and extrakeysJack Humbert2016-12-122-4/+4
| * | | | | | | | | | | | | Merge pull request #946 from climbalima/masterJack Humbert2016-12-121-11/+19
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | changed svg after mergeclimbalima2016-12-101-470/+470
| | * | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima2016-12-10108-356/+3734
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | changed svg to support proto pcbclimbalima2016-12-101-474/+482
| * | | | | | | | | | | | | Merge pull request #945 from priyadi/planck_priyadiJack Humbert2016-12-121-6/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Remove unneeded options to reduce firmware sizePriyadi Iman Nurcahyo2016-12-101-6/+2
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | put home/end on thumb clusterlucwastiaux2016-12-101-2/+2
| * | | | | | | | | | | | | readme updateslucwastiaux2016-12-101-1/+4
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'lucwastiaux2016-12-10151-609/+11350
| |\| | | | | | | | | | | |
| * | | | | | | | | | | | | use thumb cluster key to toggle brackets layerlucwastiaux2016-12-102-2/+3
| * | | | | | | | | | | | | added more shortcut keyslucwastiaux2016-11-052-9/+9
| * | | | | | | | | | | | | updated readmelucwastiaux2016-11-051-1/+2
| * | | | | | | | | | | | | removed brackets anywhere but in brackets layer, added mouse layer back in, r...lucwastiaux2016-11-053-20/+50
* | | | | | | | | | | | | | Changesxyverz2016-12-133-133/+70
* | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'xyverz2016-12-06118-534/+9578
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #936 from jackhumbert/f/shine_defaultErez Zukerman2016-12-063-30/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \