summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-03-12Merge remote-tracking branch 'upstream/master'nstickney2-0/+602
2017-03-12added US-International supportnstickney2-53/+104
2017-03-12Merge pull request #1154 from dennistruemper/neo2_on_qwerz_hardwareErez Zukerman2-0/+602
Neo2 on qwertz hardware
2017-03-11remove typo from folder nameDennis Trümper2-0/+0
2017-03-11update documentationDennis Trümper2-79/+86
2017-03-11change layer 3 on right thumb back to layer 1Dennis Trümper1-2/+2
2017-03-11working but some documentation neededDennis Trümper2-0/+595
2017-03-09Merge remote-tracking branch 'upstream/master'nstickney16-2/+944
2017-03-09found LT(layer, kc) so I could take out TapDance codenstickney2-112/+20
2017-03-09Tweaks keymap to reset on bootErez Zukerman1-1/+1
2017-03-09Merge pull request #1137 from Skrymir/patch-1Jack Humbert1-1/+1
Fixed minor error in ergodox infinity section.
2017-03-09Merge pull request #1138 from nooges/magicforce68Jack Humbert8-0/+363
Add Handwired Magicforce68
2017-03-09Merge pull request #1140 from stites/freebsdJack Humbert1-0/+19
Add FreeBSD support in "util/install_dependencies.sh"
2017-03-09Merge pull request #1142 from guni77/my_keymapJack Humbert2-0/+310
My keymap
2017-03-09Merge pull request #1143 from UnintendedFeature/feature/keymap-german-lukasJack Humbert3-0/+250
keymap german lukas
2017-03-08corralled image filesnstickney8-13/+13
2017-03-08readmeLukas Stiebig1-0/+12
Added a readme.md file for the keymap german-lukas.
2017-03-08Corrected the description of the layerLukas Stiebig1-1/+2
Corrected the description of the Shortcuts layer.
2017-03-08Added german-lukasLukas Stiebig1-0/+235
Added my keymap called germman-lukas.
2017-03-08Left control and altLukas Stiebig1-0/+2
Use the left control and the left alt key.
2017-03-08added readme fileGunther Gruber1-0/+133
2017-03-08SLASH and WHACK functions added (based on algernon's CT_TA)nstickney1-37/+0
2017-03-08SLASH and WHACK functions added (based on algernon's CT_TA)nstickney4-33/+157
2017-03-08Fix function layer actionsDanny Nguyen1-9/+4
2017-03-08Add MakefileDanny Nguyen1-0/+3
2017-03-08Merge remote-tracking branch 'upstream/master'nstickney66-349/+2369
2017-03-07Add freebsd support in "util/install_dependencies.sh"stites1-0/+19
A simple addition to the `install_dependencies` script which remaps the debian dependencies to their freebsd package-names. After a recursive clone and using gmake, I can successfully build all firmware from the root directory (minus some warnings generated by gcc-4.9.4 which I can procure on request). however there is a problem running tests.
2017-03-07Update descriptionDanny Nguyen1-1/+1
2017-03-07Add readme fileDanny Nguyen2-27/+12
2017-03-07Set pinout and layoutDanny Nguyen3-55/+61
2017-03-07Add rule for flashing microcontroller using avrdudeDanny Nguyen1-0/+10
2017-03-07Copy CMD60 as starting point and rename filesDanny Nguyen6-0/+364
2017-03-07Fixed minor error in ergodox infinity section.Joshua Colbeck1-1/+1
2017-03-04Merge pull request #1107 from qmk/clueboard_cleanupskullydazed31-257/+763
Rework the clueboard keymaps
2017-03-03Merge pull request #1126 from folkert4/masterJack Humbert4-70/+95
Various QOL changes to Espynn's keymap
2017-03-03Merge pull request #1129 from unxmaal/unxmaal_spacefnJack Humbert8-0/+710
Layout: Spacebar long-press as fn, for GH60 and GH60 Satan boards
2017-03-03Merge pull request #1130 from hot-leaf-juice/masterJack Humbert2-11/+11
moar hotkeys
2017-03-02moar hotkeysCallum Oakley2-11/+11
2017-03-02gh60 satan spacefnEric Dodd3-0/+160
2017-03-02gh60 spacefnEric Dodd5-0/+550
2017-02-28Various QOL changes:folkert44-70/+95
Removed some unneeded keys from raise and lower layers moved the + and = signs, backspace is now more intuitive moved all the Function keys to CUSTOM layer added ctrl alt del to CUSTOM layer simplified the layout picture greatly
2017-02-28Merge pull request #1124 from jmdaly/roadkit_firmwareJack Humbert14-0/+499
Add initial version of TheVan Keyboards Roadkit Firmware
2017-02-28Merge pull request #1125 from cwhits/upstreamJack Humbert1-8/+8
[Planck] Update default keymap for missing keys
2017-02-28Update default maps for missing keysChris Helming1-8/+8
2017-02-28Add initial version of TheVan Keyboards Roadkit FirmwareJohn M Daly14-0/+499
2017-02-28Merge pull request #1116 from hot-leaf-juice/masterJack Humbert2-12/+12
keymap update
2017-02-28Merge pull request #1119 from phongnh/masterJack Humbert1-1/+1
Removes redundant {} which cause build failure when DEBUG_ACTION is set
2017-02-28Merge pull request #1121 from Leszek111/masterJack Humbert5-0/+280
add layout
2017-02-27small changes in guni.c keymap to work with new qmk_firmware packetGunther Gruber1-2/+3
2017-02-27guni keymapGunther Gruber1-0/+176