summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | * | | Fixed getting "stuck" in gaming layerJoshua T2016-08-241-1/+1
| | | | | * | | Merge remote-tracking branch 'upstream/master'Joshua T2016-08-24219-3936/+16346
| | | | | |\ \ \
| | | | | * | | | 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
| | | | | * | | | Created build.batJoshua T2016-08-091-0/+51
| | | | | * | | | Merged branch master into masterJoshua T2016-08-0928-168/+1575
| | | | | |\ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | | | * | | | 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-0735-612/+2743
| | | | | |\ \ \ \
| | | | | * | | | | 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-30245-1742/+3096
| | | | | |\ \ \ \ \
| | | | | * \ \ \ \ \ 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
| | | | | |/ / / / / / / /
* | | | | / / / / / / / / Added layer images to deadcyclo layout readmeBrendan Johan Lee2017-01-105-0/+26
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | fix version macro making layer 3 sticky on deadcyclo layoutBrendan Johan Lee2017-01-031-2/+2
* | | | | | | | | | | | Added the deadcyclo layoutBrendan Johan Lee2017-01-022-0/+283
|/ / / / / / / / / / /
* | | | | | | | | | | Update config.hJack Humbert2017-01-021-1/+1
* | | | | | | | | | | Merge pull request #980 from TerryMathews/masterJack Humbert2016-12-316-0/+340
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Establish support for AMJPADTerryMathews2016-12-316-0/+340
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #975 from fredizzimo/remove_temp_filesJack Humbert2016-12-301-66/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove extra file that has been commited by mistakeFred Sundvik2016-12-291-66/+0
* | | | | | | | | | | | Merge pull request #976 from fredizzimo/fix_makefile_on_cygwinJack Humbert2016-12-301-18/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Clean up the SKIP_GIT codeFred Sundvik2016-12-291-17/+2
| * | | | | | | | | | | | Remove extra parenthesis from MakefileFred Sundvik2016-12-291-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #973 from Wilba6582/keycode_refactorJack Humbert2016-12-304-314/+331
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Keycode refactorWilba65822016-12-294-314/+331
* | | | | | | | | | | | | Merge pull request #971 from algernon/ergodox-ez/algernonJack Humbert2016-12-303-6/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ergodox: Update algernon's keymap to v1.10Gergely Nagy2016-12-283-6/+21
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #974 from fredizzimo/remove_malloc_from_sysexJack Humbert2016-12-304-27/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | API Sysex fixesFred Sundvik2016-12-294-27/+71
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #972 from mechkeys/rgb_compatJack Humbert2016-12-292-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Removed errant +Scott Wilson2016-12-291-1/+1
| * | | | | | | | | | | | Add extern for 'led' global, set 'weak' attribute for rgblight_set()Scott Wilson2016-12-282-0/+3
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #968 from ofples/bugfix/right-modifiersJack Humbert2016-12-282-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \