summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Merge pull request #489 from Skrymir/masterJack Humbert2016-07-142-0/+213
| |\
| | * Merge pull request #2 from jackhumbert/masterJoshua Colbeck2016-07-1282-786/+2969
| | |\
| | * \ Merge branch 'master' of https://github.com/Skrymir/qmk_firmwareJosh Colbeck2016-07-062-0/+213
| | |\ \
| | | * \ Merge pull request #1 from Skrymir/patch-1Joshua Colbeck2016-07-0612-244/+495
| | | |\ \
| | | | * | Changed layer switching to momentaryJosh Colbeck2016-07-061-6/+6
| | | | * | Merge remote-tracking branch 'jackhumbert/master' into patch-1Josh Colbeck2016-07-042-14/+14
| | | | |\ \
| | | | * \ \ Merge remote-tracking branch 'jackhumbert/master' into patch-1Josh Colbeck2016-07-048-230/+268
| | | | |\ \ \
| | | | * | | | Added macro and readmeJosh Colbeck2016-07-042-18/+40
| | | | * | | | Added new keymapJosh Colbeck2016-07-041-0/+191
| | | | * | | | Revert "Changed layout of left hand main layer"Josh Colbeck2016-07-031-12/+12
| | | | * | | | Changed layout of left hand main layerJoshua Colbeck2016-07-031-12/+12
| | | |/ / / /
| * | | | | | Merge pull request #515 from pvinis/reset-functionJack Humbert2016-07-142-10/+16
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | extract reset keyboard into a functionPavlos Vinieratos2016-07-132-10/+16
| |/ / / / /
* | | | | | 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
|/ / / / /
* | | | | Merge pull request #477 from Smilliam/masterJack Humbert2016-07-113-1/+19
|\ \ \ \ \
| * | | | | amended extraneous file editsSmilliam2016-07-102-7/+1
| * | | | | Made rollover behavior for space cadet optionalSmilliam2016-07-104-10/+26
| * | | | | fixed indentation.Smilliam2016-07-041-8/+8
| * | | | | Allow Space Cadet state to be canceled by alternate Shift keySmilliam2016-07-041-0/+8
| | |_|_|/ | |/| | |
* | | | | Merge pull request #506 from stanleylai/masterJack Humbert2016-07-112-0/+104
|\ \ \ \ \
| * | | | | Added my custom keymap for SatanStanley Lai2016-07-102-0/+104
* | | | | | Merge pull request #507 from ruiqimao/masterskullydazed2016-07-114-17/+33
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fixed clueboard LED pin assignments and matrix documentationRuiqi Mao2016-07-114-17/+33
|/ / / / /
* | | | | Merge pull request #505 from fredizzimo/documentation_fixJack Humbert2016-07-101-3/+0
|\ \ \ \ \
| * | | | | Remove out of place documentation, caused by ChibiOS mergeFred Sundvik2016-07-101-3/+0
* | | | | | Merge pull request #502 from robotmaxtron/masterJack Humbert2016-07-095-0/+544
|\ \ \ \ \ \
| * | | | | | Update keymap.cMax Whittingham2016-07-091-3/+1
| * | | | | | Cleaning up repoMax Whittingham2016-07-095-0/+546
|/ / / / / /
* | | | | | Merge pull request #500 from TerryMathews/masterJack Humbert2016-07-091-0/+116
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #1 from jackhumbert/masterTerryMathews2016-07-0910-47/+267
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Documents tap danceErez Zukerman2016-07-081-0/+75
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #498 from fredizzimo/fix_make_dependenciesJack Humbert2016-07-081-10/+12
|\ \ \ \ \ \
| * | | | | | Use order only prerequisites to avoid re-linkingFred Sundvik2016-07-081-9/+11
| * | | | | | Fix name of makefile dep filesFred Sundvik2016-07-081-1/+1
|/ / / / / /
* | | | | | Merge pull request #496 from fredizzimo/makefile_optimizationJack Humbert2016-07-082-39/+22
|\ \ \ \ \ \
| * | | | | | Fix the link targetFred Sundvik2016-07-081-1/+1
| * | | | | | Don't run git describe for ever file that is builtFred Sundvik2016-07-081-1/+1
| * | | | | | Speed up compilation by not using recusive makeFred Sundvik2016-07-081-38/+21
* | | | | | | Merge pull request #494 from robbiegill/masterJack Humbert2016-07-087-1/+161
|\ \ \ \ \ \ \
| * | | | | | | port missing support for hhkb-jp from tmkRobbie Gill2016-07-077-1/+161
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #493 from TerryMathews/masterJack Humbert2016-07-0812-595/+92
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| | | * | | | Establish Poker clone keymap for SatanTerryMathews2016-07-091-0/+116
| | |/ / / / | |/| | | |