summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | * | | | | Merge remote-tracking branch 'upstream/master'Joshua T2016-07-2697-431/+6775
| | | | | | | | | |\ \ \ \ \
| | | | | | | | | * | | | | | 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
| | | | | | | | | * | | | | | Merge branch 'master' of https://github.com/replicaJunction/qmk_firmwareJoshua T2016-07-150-0/+0
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | * | | | | | Added default layer switch QWERTY to ColemakJoshua T2016-07-151-3/+3
| | | | | | | | | * | | | | | | 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-154-10/+229
| | | | | | | | | |\ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | |
| | | | | | | | | * | | | | | 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-1322-58/+548
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | specialise music variablesJack Humbert2016-12-121-3/+3
| * | | | | | | | | | | | | re-enable audio and extrakeysJack Humbert2016-12-124-5/+27
| * | | | | | | | | | | | | 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-10149-2031/+6676
| | |\| | | | | | | | | | |
| | * | | | | | | | | | | | 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
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #944 from priyadi/negmousefixJack Humbert2016-12-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Allow negative values for mouse movementsPriyadi Iman Nurcahyo2016-12-101-1/+1
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #943 from lucwastiaux/masterJack Humbert2016-12-123-27/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | put home/end on thumb clusterlucwastiaux2016-12-101-2/+2
| | * | | | | | | | | | | | | readme updateslucwastiaux2016-12-101-1/+4
| | * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'lucwastiaux2016-12-10199-2387/+14766
| | |\| | | | | | | | | | | |
| | * | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | Merge pull request #942 from priyadi/cpp11Jack Humbert2016-12-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | The adafruit BLE C++ code requires -std=c++11Priyadi Iman Nurcahyo2016-12-101-1/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Changesxyverz2016-12-133-133/+70
* | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'xyverz2016-12-06159-2209/+12520
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Update readme.mdJack Humbert2016-12-061-1560/+2
| * | | | | | | | | | | | | Merge pull request #936 from jackhumbert/f/shine_defaultErez Zukerman2016-12-063-30/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | A new default layout that supports ShineErez Zukerman2016-12-052-27/+59
| | * | | | | | | | | | | | | Adjusts config for better mousekey supportErez Zukerman2016-12-051-3/+4
| * | | | | | | | | | | | | | Merge pull request #921 from Wilba6582/raw_hidJack Humbert2016-12-057-10/+222
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Update planck.cJack Humbert2016-12-041-14/+0
| | * | | | | | | | | | | | | | Update rules.mkJack Humbert2016-12-040-0/+0
| | * | | | | | | | | | | | | | Update rules.mkJack Humbert2016-12-041-3/+2
| | * | | | | | | | | | | | | | Initial version of Raw HID interfaceWilba65822016-12-017-10/+237
| * | | | | | | | | | | | | | | Merge pull request #935 from priyadi/promethiumJack Humbert2016-12-045-79/+197
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \