summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sculpt2milestogo2017-03-08172-2243/+6603
|\
| * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwaremilestogo2017-03-08140-1986/+5122
| |\
| | * 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
| | * | | | 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
| | |/ / /
| | * | | Merge pull request #1116 from hot-leaf-juice/masterJack Humbert2017-02-272-12/+12
| | |\ \ \
| | | * | | updated readmeCallum Oakley2017-02-221-5/+5
| | | * | | added hotkey clusterCallum Oakley2017-02-211-7/+7
| | * | | | Merge pull request #1119 from phongnh/masterJack Humbert2017-02-271-1/+1
| | |\ \ \ \
| | | * | | | Removes redundant {} which cause build failure when DEBUG_ACTION is setPhong Nguyen2017-02-251-1/+1
| | | | |_|/ | | | |/| |
| | * | | | Merge pull request #1121 from Leszek111/masterJack Humbert2017-02-275-0/+280
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Ammend readme.md2017-02-271-2/+4
| | | * | | Add colemak_programmer2017-02-275-0/+278
| | * | | | Merge pull request #1118 from priyadi/promethiumJack Humbert2017-02-232-26/+33
| | |\ \ \ \
| | | * | | | Fix UNICODE_MAP input_mode problemPriyadi Iman Nurcahyo2017-02-231-4/+6
| | | * | | | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-2317-104/+360
| | | |\ \ \ \
| | | * | | | | added pause, prtsc & ins to list of keys to be processed on releasePriyadi Iman Nurcahyo2017-02-211-2/+5
| | | * | | | | Move caps to FUN layer; add Pause keyPriyadi Iman Nurcahyo2017-02-211-12/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 02:42:39 +0000