Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added Gaming layer and removed Dvorak | Joshua T | 2016-07-19 | 1 | -23/+23 |
* | Merge branch 'master' of https://github.com/replicaJunction/qmk_firmware | Joshua T | 2016-07-15 | 0 | -0/+0 |
|\ | |||||
| * | Added default layer switch QWERTY to Colemak | Joshua T | 2016-07-15 | 1 | -3/+3 |
* | | Added default layer switch QWERTY to Colemak | Joshua T | 2016-07-15 | 1 | -3/+5 |
|/ | |||||
* | Fixed a merge conflict | Joshua T | 2016-07-15 | 1 | -9/+0 |
* | Merge remote-tracking branch 'upstream/master' | Joshua T | 2016-07-15 | 4 | -10/+229 |
|\ | |||||
| * | Merge pull request #489 from Skrymir/master | Jack Humbert | 2016-07-14 | 2 | -0/+213 |
| |\ | |||||
| | * | Merge pull request #2 from jackhumbert/master | Joshua Colbeck | 2016-07-12 | 82 | -786/+2969 |
| | |\ | |||||
| | * \ | Merge branch 'master' of https://github.com/Skrymir/qmk_firmware | Josh Colbeck | 2016-07-06 | 2 | -0/+213 |
| | |\ \ | |||||
| | | * \ | Merge pull request #1 from Skrymir/patch-1 | Joshua Colbeck | 2016-07-06 | 12 | -244/+495 |
| | | |\ \ | |||||
| | | | * | | Changed layer switching to momentary | Josh Colbeck | 2016-07-06 | 1 | -6/+6 |
| | | | * | | Merge remote-tracking branch 'jackhumbert/master' into patch-1 | Josh Colbeck | 2016-07-04 | 2 | -14/+14 |
| | | | |\ \ | |||||
| | | | * \ \ | Merge remote-tracking branch 'jackhumbert/master' into patch-1 | Josh Colbeck | 2016-07-04 | 8 | -230/+268 |
| | | | |\ \ \ | |||||
| | | | * | | | | Added macro and readme | Josh Colbeck | 2016-07-04 | 2 | -18/+40 |
| | | | * | | | | Added new keymap | Josh Colbeck | 2016-07-04 | 1 | -0/+191 |
| | | | * | | | | Revert "Changed layout of left hand main layer" | Josh Colbeck | 2016-07-03 | 1 | -12/+12 |
| | | | * | | | | Changed layout of left hand main layer | Joshua Colbeck | 2016-07-03 | 1 | -12/+12 |
| | | |/ / / / | |||||
| * | | | | | | Merge pull request #515 from pvinis/reset-function | Jack Humbert | 2016-07-14 | 2 | -10/+16 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | extract reset keyboard into a function | Pavlos Vinieratos | 2016-07-13 | 2 | -10/+16 |
| |/ / / / / | |||||
* | | | | | | Corrected merge conflict | Joshua T | 2016-07-13 | 1 | -0/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Created replicaJunction keymaps. | Joshua T | 2016-07-11 | 2 | -0/+489 |
| |/ / / / / | |||||
* / / / / / | Created replicaJunction keymaps. | Joshua T | 2016-07-13 | 2 | -0/+503 |
|/ / / / / | |||||
* | | | | | Merge pull request #477 from Smilliam/master | Jack Humbert | 2016-07-11 | 3 | -1/+19 |
|\ \ \ \ \ | |||||
| * | | | | | amended extraneous file edits | Smilliam | 2016-07-10 | 2 | -7/+1 |
| * | | | | | Made rollover behavior for space cadet optional | Smilliam | 2016-07-10 | 4 | -10/+26 |
| * | | | | | fixed indentation. | Smilliam | 2016-07-04 | 1 | -8/+8 |
| * | | | | | Allow Space Cadet state to be canceled by alternate Shift key | Smilliam | 2016-07-04 | 1 | -0/+8 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #506 from stanleylai/master | Jack Humbert | 2016-07-11 | 2 | -0/+104 |
|\ \ \ \ \ | |||||
| * | | | | | Added my custom keymap for Satan | Stanley Lai | 2016-07-10 | 2 | -0/+104 |
* | | | | | | Merge pull request #507 from ruiqimao/master | skullydazed | 2016-07-11 | 4 | -17/+33 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | fixed clueboard LED pin assignments and matrix documentation | Ruiqi Mao | 2016-07-11 | 4 | -17/+33 |
|/ / / / / | |||||
* | | | | | Merge pull request #505 from fredizzimo/documentation_fix | Jack Humbert | 2016-07-10 | 1 | -3/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Remove out of place documentation, caused by ChibiOS merge | Fred Sundvik | 2016-07-10 | 1 | -3/+0 |
* | | | | | | Merge pull request #502 from robotmaxtron/master | Jack Humbert | 2016-07-09 | 5 | -0/+544 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update keymap.c | Max Whittingham | 2016-07-09 | 1 | -3/+1 |
| * | | | | | | Cleaning up repo | Max Whittingham | 2016-07-09 | 5 | -0/+546 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #500 from TerryMathews/master | Jack Humbert | 2016-07-09 | 1 | -0/+116 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #1 from jackhumbert/master | TerryMathews | 2016-07-09 | 10 | -47/+267 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Documents tap dance | Erez Zukerman | 2016-07-08 | 1 | -0/+75 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #498 from fredizzimo/fix_make_dependencies | Jack Humbert | 2016-07-08 | 1 | -10/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use order only prerequisites to avoid re-linking | Fred Sundvik | 2016-07-08 | 1 | -9/+11 |
| * | | | | | | Fix name of makefile dep files | Fred Sundvik | 2016-07-08 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #496 from fredizzimo/makefile_optimization | Jack Humbert | 2016-07-08 | 2 | -39/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix the link target | Fred Sundvik | 2016-07-08 | 1 | -1/+1 |
| * | | | | | | Don't run git describe for ever file that is built | Fred Sundvik | 2016-07-08 | 1 | -1/+1 |
| * | | | | | | Speed up compilation by not using recusive make | Fred Sundvik | 2016-07-08 | 1 | -38/+21 |
* | | | | | | | Merge pull request #494 from robbiegill/master | Jack Humbert | 2016-07-08 | 7 | -1/+161 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | port missing support for hhkb-jp from tmk | Robbie Gill | 2016-07-07 | 7 | -1/+161 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #493 from TerryMathews/master | Jack Humbert | 2016-07-08 | 12 | -595/+92 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| | | * | | | | Establish Poker clone keymap for Satan | TerryMathews | 2016-07-09 | 1 | -0/+116 |
| | |/ / / / | |/| | | | |