summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [Keymap] Vitamins_included keymap vitavim (#8864)Daniel Dylewsky2020-04-272-0/+148
* [Keyboard] Aplx2 osu! keyboard (#8847)Aplyard2020-04-276-0/+168
* [Docs] Japanese translation of docs/feature_grave_esc.md (#8873)umi2020-04-271-0/+37
* [Docs] Japanese translation of docs/feature_hd44780.md (#8875)umi2020-04-271-0/+62
* Merge pull request #8931 from kbrock/kle2info_2Joel Challis2020-04-262-3/+3
|\
| * kle2info: trim down x and y outputKeenan Brock2020-04-261-2/+2
| * kle2json: fix invocation errorKeenan Brock2020-04-261-1/+1
|/
* [Docs] Japanese translation of docs/feature_dynamic_macros.md (#8842)umi2020-04-261-0/+71
* [Keymap] Make personal keymaps a bit more consistent (#8915)Jonathan Rascher2020-04-2512-51/+48
* [Keyboard] Add pimentoso/paddino02 (#8756)Michele Ferri2020-04-2518-0/+347
* Merge pull request #8896 from Salicylic-acid3/masterJoel Challis2020-04-252-4/+4
|\
| * Update keyboards/7skb/rev1/config.hSalicylic-acid32020-04-251-1/+1
| * Update keyboards/7skb/rev1/config.hSalicylic-acid32020-04-251-1/+1
| * Correction of the number of LEDs and DEVICE_VER.Salicylic-acid32020-04-242-4/+4
* | Merge pull request #8881 from Maartenwut/ta-65-viaJoel Challis2020-04-252-0/+34
|\ \
| * | Add VIA support for ta-65Maarten Dekkers2020-04-222-0/+34
* | | New 65 ANSI Blocker layouts: Split BS, Tsangan (#8793)Brandon Schlack2020-04-258-0/+237
* | | Add Keebio lighting defaults (#8884)Danny2020-04-2513-135/+201
* | | Merge pull request #8897 from Maartenwut/ta-65-encoderJoel Challis2020-04-243-26/+58
|\ \ \
| * | | Change keymap encoder codeMaarten Dekkers2020-04-241-24/+15
| * | | Update keymap.cMaarten Dekkers2020-04-241-2/+2
| * | | Add encoder to ta-65 default keymapMaarten Dekkers2020-04-231-12/+42
| * | | Add encoder to ta-65Maarten Dekkers2020-04-232-14/+25
| | |/ | |/|
* | | Merge pull request #8905 from marhalloweenvt/marhalloweenvt_devJoel Challis2020-04-241-86/+86
|\ \ \
| * | | Adjust info.json to work with QMK Config toolmarhalloweenvt2020-04-251-86/+86
* | | | Merge pull request #8806 from awkannan/202004_obliterated75Joel Challis2020-04-2412-0/+1679
|\ \ \ \
| * | | | Update keyboards/cannonkeys/obliterated75/keymaps/default/keymap.cAndrew Kannan2020-04-211-1/+1
| * | | | Apply suggestions from code reviewAndrew Kannan2020-04-174-7/+7
| * | | | Apply suggestions from code reviewAndrew Kannan2020-04-165-20/+23
| * | | | Whitespace changesAndrew Kannan2020-04-153-7/+2
| * | | | Add new obliterated75 filesAndrew Kannan2020-04-1512-0/+1681
* | | | | Merge pull request #8807 from danielhklein/uni660rev2Joel Challis2020-04-2425-31/+371
|\ \ \ \ \
| * | | | | split config.hDaniel Klein2020-04-212-0/+78
| * | | | | split rev2.h for ansi and isoDaniel Klein2020-04-213-19/+28
| * | | | | uni660rev2 addedDaniel Klein2020-04-1423-31/+284
* | | | | | Merge pull request #8867 from bbeckford/masterJoel Challis2020-04-241-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/bbeckford/qmk_firmwareBen Beckford2020-04-201-1/+10
| |\ \ \ \ \ \
| * | | | | | | Changed default RGBLIGHT_SLEEP for cospadBen Beckford2020-04-201-1/+1
* | | | | | | | Fix ISO Enter order in Wasdat info.json (#8891)Joel Challis2020-04-241-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix ISO Enter order in Wasdat info.jsonfauxpark2020-04-241-2/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | VIA keymap for JJ4x4 and general cleanup (#8888)Ryan2020-04-248-99/+140
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | [Keyboard] Add p1800fl (#8879)marhalloweenvt2020-04-248-0/+330
* | | | | | | Update Plain60 VIA keymap (#8882)Maarten Dekkers2020-04-241-12/+27
* | | | | | | [Keyboard] Add VIA support for Wasdat Code (#8892)Maarten Dekkers2020-04-234-2/+55
* | | | | | | [Keymap] Dvorak for Keeb.io Iris (#8863)Peter Becich2020-04-235-0/+316
* | | | | | | Add missing packages to Linux install scripts (#8895)Ryan2020-04-231-1/+7
* | | | | | | Added YD60MQ ISO layout (#8815)Marc2020-04-244-1/+115
* | | | | | | [Keyboard] Add VIA support for Wete, fix layout error (#8802)Ramon Imbao2020-04-234-12/+68
|/ / / / / /
* | | | | | [Keyboard] Add wasdat code controller (#8858)Maarten Dekkers2020-04-2211-0/+1390
* | | | | | fix sample code indent in feature_encoders.md (#8883)Takeshi ISHII2020-04-232-2/+2