summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* added README.mdnstickney2017-03-121-0/+3
* Merge remote-tracking branch 'upstream/master'nstickney2017-03-122-0/+602
|\
| * Merge pull request #1154 from dennistruemper/neo2_on_qwerz_hardwareErez Zukerman2017-03-122-0/+602
| |\
| | * remove typo from folder nameDennis Trümper2017-03-112-0/+0
| | * update documentationDennis Trümper2017-03-112-79/+86
| | * change layer 3 on right thumb back to layer 1Dennis Trümper2017-03-111-2/+2
| | * working but some documentation neededDennis Trümper2017-03-112-0/+595
| |/
* | added US-International supportnstickney2017-03-122-53/+104
* | Merge remote-tracking branch 'upstream/master'nstickney2017-03-0816-2/+944
|\|
| * Tweaks keymap to reset on bootErez Zukerman2017-03-081-1/+1
| * Merge pull request #1137 from Skrymir/patch-1Jack Humbert2017-03-081-1/+1
| |\
| | * Fixed minor error in ergodox infinity section.Joshua Colbeck2017-03-071-1/+1
| * | Merge pull request #1138 from nooges/magicforce68Jack Humbert2017-03-088-0/+363
| |\ \
| | * | Fix function layer actionsDanny Nguyen2017-03-071-9/+4
| | * | Add MakefileDanny Nguyen2017-03-071-0/+3
| | * | Update descriptionDanny Nguyen2017-03-071-1/+1
| | * | Add readme fileDanny Nguyen2017-03-072-27/+12
| | * | Set pinout and layoutDanny Nguyen2017-03-073-55/+61
| | * | Add rule for flashing microcontroller using avrdudeDanny Nguyen2017-03-071-0/+10
| | * | Copy CMD60 as starting point and rename filesDanny Nguyen2017-03-076-0/+364
| | |/
| * | Merge pull request #1140 from stites/freebsdJack Humbert2017-03-081-0/+19
| |\ \
| | * | Add freebsd support in "util/install_dependencies.sh"stites2017-03-071-0/+19
| | |/
| * | Merge pull request #1142 from guni77/my_keymapJack Humbert2017-03-082-0/+310
| |\ \
| | * | added readme fileGunther Gruber2017-03-081-0/+133
| | * | small changes in guni.c keymap to work with new qmk_firmware packetGunther Gruber2017-02-271-2/+3
| | * | guni keymapGunther Gruber2017-02-271-0/+176
| * | | Merge pull request #1143 from UnintendedFeature/feature/keymap-german-lukasJack Humbert2017-03-083-0/+250
| |\ \ \ | | |_|/ | |/| |
| | * | readmeLukas Stiebig2017-03-081-0/+12
| | * | Corrected the description of the layerLukas Stiebig2017-03-081-1/+2
| | * | Added german-lukasLukas Stiebig2017-03-081-0/+235
| | * | Left control and altLukas Stiebig2017-03-081-0/+2
| |/ /
* | | found LT(layer, kc) so I could take out TapDance codenstickney2017-03-082-112/+20
* | | corralled image filesnstickney2017-03-088-13/+13
* | | SLASH and WHACK functions added (based on algernon's CT_TA)nstickney2017-03-071-37/+0
* | | SLASH and WHACK functions added (based on algernon's CT_TA)nstickney2017-03-074-33/+157
* | | Merge remote-tracking branch 'upstream/master'nstickney2017-03-0766-349/+2369
|\| |
| * | Merge pull request #1107 from qmk/clueboard_cleanupskullydazed2017-03-0431-257/+763
| |\ \
| | * | Add the mouse_keys layoutskullY2017-02-162-0/+11
| | * | Rework the clueboard keymaps a bit.skullY2017-02-1630-257/+752
| * | | Merge pull request #1126 from folkert4/masterJack Humbert2017-03-034-70/+95
| |\ \ \
| | * | | Various QOL changes:folkert42017-02-284-70/+95
| * | | | Merge pull request #1129 from unxmaal/unxmaal_spacefnJack Humbert2017-03-038-0/+710
| |\ \ \ \
| | * | | | gh60 satan spacefnEric Dodd2017-03-013-0/+160
| | * | | | gh60 spacefnEric Dodd2017-03-015-0/+550
| | |/ / /
| * | | | Merge pull request #1130 from hot-leaf-juice/masterJack Humbert2017-03-032-11/+11
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | moar hotkeysCallum Oakley2017-03-022-11/+11
| |/ / /
| * | | Merge pull request #1124 from jmdaly/roadkit_firmwareJack Humbert2017-02-2814-0/+499
| |\ \ \
| | * | | Add initial version of TheVan Keyboards Roadkit FirmwareJohn M Daly2017-02-2814-0/+499
| * | | | Merge pull request #1125 from cwhits/upstreamJack Humbert2017-02-281-8/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update default maps for missing keysChris Helming2017-02-281-8/+8
| |/ / /