Commit Graph

3693 Commits (af119baf710c0b19cfe3351e3f3e89ddeeaacdf6)
 

Author SHA1 Message Date
Jack Humbert af119baf71 Merge pull request #894 from dchagniot/ergodoxDvorakEmacs
8 years ago
Jack Humbert 4bb0eaef26 Merge pull request #893 from Sihui/sh-hhkb-jp
8 years ago
Jack Humbert be265decae Merge pull request #892 from fredizzimo/disable_ergodox_lcd
8 years ago
Jack Humbert 377583d9f3 Merge pull request #891 from g-sam/galson-keymap
8 years ago
Jack Humbert 132c079534 Merge pull request #890 from algernon/f/space-cadet/timeout
8 years ago
Jack Humbert e0fc186c28 Merge pull request #888 from climbalima/master
8 years ago
Jack Humbert ea472fb018 Merge pull request #887 from profet23/atreus62
8 years ago
Sihui Huang b75538c0bf add del to new cmd
8 years ago
Sihui Huang 390a1bda8b add space to NewCmd layer
8 years ago
Sihui Huang ccc34851f2 add space to NewCmd layer
8 years ago
Didier Chagniot 6f24344be7 typo fix
8 years ago
Sihui Huang 23f63ed1b9 Update README.md
8 years ago
Sihui Huang 34aa59c6d5 Update README.md
8 years ago
Sihui Huang 11f17e3b23 Update README.md
8 years ago
Sihui Huang a8b1c47f0f add sh-hhkb-jp layers
8 years ago
Fred Sundvik c86bbf474e Always initialze the Infinity Ergodox backlight
8 years ago
Jack Humbert 3b990c08dc Merge pull request #878 from sethbc/add_sethbc_gh60_keymap
8 years ago
Seth Chandler df8724ce08 remove KC expansion from GH60
8 years ago
Gergely Nagy 74a1f00713 Fix the Space Cadet timeout code
8 years ago
Seth Chandler 620e4f74d3 move KC expansion to separate macros
8 years ago
Seth Chandler ac7d202d4f merge upstream/master
8 years ago
samgalson@gmail.com 7f5e71d79f adds galson keymap
8 years ago
Gergely Nagy ffa5b1e7ea Add a timeout to space-cadet shift.
8 years ago
climbalima 102a830bbd changed readme
8 years ago
climbalima e356de2220 added the pinout for pro micro into maxipad
8 years ago
Jack Humbert a06115df19 don't always detect a matrix change (fixes debounce)
8 years ago
Benjamin Grabkowitz 6c5fce5c1a Adding readme placeholder
8 years ago
Benjamin Grabkowitz 00d88b74ad Adding Support for atreus62 keyboard. https://github.com/profet23/atreus62
8 years ago
Jack Humbert c38b3e3be9 Merge pull request #883 from climbalima/master
8 years ago
climbalima b085a34506 fixed readme conflicts
8 years ago
climbalima 21b6b4e6c4 should have fixed conflixed
8 years ago
climbalima 668c739702 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
8 years ago
climbalima 5cac51a773 Merge https://github.com/climbalima/qmk_firmware
8 years ago
climbalima 1dd6ceb45d Updated my repo to current qmk
8 years ago
Jack Humbert 72e78a017f Merge pull request #882 from seebs/master
8 years ago
Seebs 4da698fda3 dvorak/plover keyboard layout
8 years ago
Jack Humbert 9f1b27c5ba Merge pull request #880 from psyill/master
8 years ago
Jack Humbert e025a94bc2 Merge pull request #879 from sethbc/update_sethbc_ergodox_keymap
8 years ago
Jack Humbert d85f6deb9b Merge pull request #877 from sethbc/update_sethbc_satan_keymap
8 years ago
Jack Humbert 6dde65c2a9 Merge pull request #876 from Dbroqua/master
8 years ago
Jack Humbert 17e1a4f825 Merge pull request #866 from fredizzimo/infinity60_clockfixes
8 years ago
Jack Humbert 7541122cad Merge pull request #860 from IBNobody/master
8 years ago
climbalima bce6e52391 fixed conflict
8 years ago
climbalima dd22c787b8 fixed extra paste
8 years ago
Hans Ellegård 162f603b1c Added keymap "videck", an ErgoDox keymap for Vi(m) users.
8 years ago
Seth Chandler aa76425395 oops, fixed inverted if statement
8 years ago
Seth Chandler 34bf8558cd update sethbc ergodox keymap
8 years ago
Seth Chandler b2bc215934 add sethbc keymap for gh60 and update macro expansion in connection with same
8 years ago
Seth Chandler 28249498bc update sethbc keymap
8 years ago
Damien 0a99cf300c Merge pull request #12 from jackhumbert/master
8 years ago