Commit Graph

25230 Commits (173f54cf1f6e7119bcb09c1f61b6dc575dc40ecc)
 

Author SHA1 Message Date
Joshua T 0642126720 Merge branch 'master' of https://github.com/replicaJunction/qmk_firmware 9 years ago
Joshua T 243ae75256 Added default layer switch QWERTY to Colemak 9 years ago
Joshua T c5768a5f32 Added default layer switch QWERTY to Colemak 9 years ago
Joshua T 77377e2784 Fixed a merge conflict 9 years ago
Pavlos Vinieratos f3b56701ed add an `anyway` and a `reset` callback 9 years ago
Pavlos Vinieratos 1a7e954f9f in case its NULL 9 years ago
Erik Dasque aa2a79bbfa Further simplyfying the docker usage 9 years ago
Erik Dasque 0446263935 Adding Docker build system & documentation 9 years ago
Christopher Browne ba0d81f270 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 9 years ago
Travis La Marr d48a4cf1eb Fix OS X Recognizing keyboard as Mouse/Tablet 9 years ago
Travis La Marr 0b8c448b30 Make DFU wait for bootloader 9 years ago
Joshua T 42843d9b62 Merge remote-tracking branch 'upstream/master' 9 years ago
Jonathan A. Kollasch 4278d88615 keymap_dvorak.h: add missing shifted keys, fix whitespace 9 years ago
Jonathan A. Kollasch 25938a09a6 extra_keymaps: use RALT() instead of 0x1400 for AltGr 9 years ago
Jonathan A. Kollasch 010dd13084 keymap_extras: add newline at end of files 9 years ago
Jack Humbert 9ecf9073b9 Merge pull request #489 from Skrymir/master 9 years ago
Jack Humbert 8bbbbcddf9 Merge pull request #515 from pvinis/reset-function 9 years ago
Will Wolff-Myren 76469ebbcf Replaced ordinary-media.{png|json} with new media layout 9 years ago
Will Wolff-Myren 1b776f0f33 Replaced ordinary-symbol.{png|json} with new base layout. 9 years ago
Will Wolff-Myren b587245430 Replaced ordinary-base.{png|json} with new base layout. 9 years ago
Will Wolff-Myren 825aead3bd Replaced readme.md with stub 9 years ago
Joshua T 92e7291ad7 Corrected merge conflict 9 years ago
Joshua T f90d89458c Created replicaJunction keymaps. 9 years ago
Will Wolff-Myren 8f3cdea357 Created "teckinesis" keymap folder 9 years ago
Pavlos Vinieratos a28a6e5b79 extract reset keyboard into a function 9 years ago
Josh Colbeck fb46eb2de1 Added open resource macro 9 years ago
Joshua Colbeck 68ceffe53e Merge pull request #2 from jackhumbert/master 9 years ago
Christopher Browne f4fbfe6e54 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 9 years ago
Christopher Browne 477ed703c8 I did not like Space Cadet paren; it jumps in in way too many extra cases 9 years ago
Joshua T 32725dae5b Created replicaJunction keymaps. 9 years ago
Jack Humbert a998a48673 Merge pull request #477 from Smilliam/master 9 years ago
Jack Humbert 076de6fa75 Merge pull request #506 from stanleylai/master 9 years ago
skullydazed d5102c7715 Merge pull request #507 from ruiqimao/master 9 years ago
Ruiqi Mao cb0e102adb fixed clueboard LED pin assignments and matrix documentation 9 years ago
Smilliam 5e58e2281a amended extraneous file edits 9 years ago
Smilliam b12fe6abb2 Made rollover behavior for space cadet optional 9 years ago
Stanley Lai 753cbee5c0 Added my custom keymap for Satan 9 years ago
Jack Humbert 4081fc4d8f Merge pull request #505 from fredizzimo/documentation_fix 9 years ago
Fred Sundvik c7728780de Remove out of place documentation, caused by ChibiOS merge 9 years ago
Jack Humbert b0300d8d8f Merge pull request #502 from robotmaxtron/master 9 years ago
Max Whittingham df958a2dbc Update keymap.c 9 years ago
Jack Humbert 9dc6dfbf96 Merge pull request #500 from TerryMathews/master 9 years ago
TerryMathews 4decdd2b18 Merge pull request #1 from jackhumbert/master 9 years ago
TerryMathews 979a0d25f0 Establish Poker clone keymap for Satan 9 years ago
Max Whittingham 1ab527a4db Cleaning up repo 9 years ago
Erez Zukerman c444f4f702 Documents tap dance 9 years ago
Jack Humbert 4139841e9d Merge pull request #498 from fredizzimo/fix_make_dependencies 9 years ago
Fred Sundvik 6911ead027 Use order only prerequisites to avoid re-linking 9 years ago
Fred Sundvik e8e300d5c4 Fix name of makefile dep files 9 years ago
Jack Humbert 8610481c37 Merge pull request #496 from fredizzimo/makefile_optimization 9 years ago