summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1144 from milestogo/sculpt2Jack Humbert2017-03-1517-0/+1498
|\
| * Merge branch 'master' into sculpt2milestogo2017-03-08172-2243/+6603
| |\
| | * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwaremilestogo2017-03-08140-1986/+5122
| | |\
| | * \ :milestogo2017-02-1211-62/+444
| | |\ \
| | * \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwaremilestogo2017-02-1132-365/+1207
| | |\ \ \
| * | | | | docs for babblepastemilestogo2017-03-082-481/+115
| * | | | | fix stupid error w/ mode switchmilestogo2017-03-088-25/+51
| * | | | | added browser babble, removed code from keymapmilestogo2017-03-084-212/+438
| * | | | | working with preprocessor macros for babblepastemilestogo2017-03-065-431/+395
| * | | | | clean up babblepastemilestogo2017-02-283-0/+1029
| * | | | | missed config.h stuck modifiers changemilestogo2017-02-281-2/+4
| * | | | | keymap and C6 audio testingmilestogo2017-02-283-28/+125
| * | | | | keymap updatemilestogo2017-02-112-12/+24
| * | | | | Merge branch 'master' into sculpt2milestogo2017-02-0981-304/+2839
| |\| | | |
| | * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwaremilestogo2017-02-0981-304/+2839
| | |\ \ \ \
| * | | | | | dumber sculpt buildmilestogo2017-02-0914-0/+508
| |/ / / / /
* | | | | | update for infinityJack Humbert2017-03-151-1/+1
* | | | | | Update readme.mdJack Humbert2017-03-131-1/+1
* | | | | | 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
|/ / / / / /
* | | | | / 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
|/ / / / / /
* | | | | | 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