summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* DO NOT USE Merge branch 'master' into debounce_refactorAlex Ong2019-01-261320-13367/+28758
|\
| * Merge branch 'master' of https://github.com/qmk/qmk_firmwareAlex Ong2019-01-261320-13415/+28757
| |\
| | * Circular animation (#4796)Drashna Jaelre2019-01-252-6/+18
| | |\
| | | * Fix indentation in tmk_core led_matrix.cIan O'Dea2019-01-071-9/+9
| | | * Make arm_atsam led matrix circular animation circular rather than obloidIan O'Dea2019-01-072-1/+4
| | | * Add ability to animate arm_atsam led matrix from the center of a circleIan O'Dea2019-01-072-6/+15
| | * | [Keyboard] Support for Wheat Field Peripherals blocked 65% PCB (#4763)walkerstop2019-01-258-0/+207
| | * | move `#include "rgb.h"` from quantum.h to quantum.cmtei2019-01-252-3/+5
| | * | Add C(), A() and G() to match already existing S() (#4673)fauxpark2019-01-2512-62/+64
| | * | Add MOD_MASK_* macros to core code (#4337)Konstantin Đorđević2019-01-251-0/+16
| | * | rs: code friendly keymap for preonic, iris and my preonic clone (#4303)Olivier Poitrey2019-01-2520-0/+1030
| | * | Fix process_combo which assign -1 to uint16_t (#3697)Drashna Jaelre2019-01-252-9/+10
| | |\ \
| | | * | Fix process_combo which assign -1 to uint16_tShihpin Tseng2018-08-202-9/+10
| | * | | Fix oneshot_time wrong type (#3696)Shihpin Tseng2019-01-251-2/+2
| | * | | Fix problem that MAGIC_SWAP_ALT_GUI will not be effective when OSM(mod) is usedMakotoKurauchi2019-01-251-1/+1
| | * | | Adding documentation for the LM layer modifier. (#3617)Dave Brown2019-01-251-1/+1
| | * | | Add support for RETRO_TAPPING to LT(layer, kc)lambda_sakura2019-01-252-1/+10
| | * | | [Keymap] New kbd67/hotswap keymap for writing both code and math (#4933)zunger-humu2019-01-254-0/+227
| | * | | Add support for Clueboard 66% rev4skullY2019-01-248-0/+1465
| | * | | Fix a typo in link to the Pro Micro ISP firmwareBalz Guenat2019-01-241-1/+1
| | * | | [Keyboard] Remove hadron ver0 as it is no longer required (#4921)zvecr2019-01-244-40/+0
| | * | | Remove unused fn_actions[] and action_function() in default keymaps (#4829)fauxpark2019-01-2418-153/+18
| | * | | [Keyboard] KBD67: enable bootmagic lite by default (#4931)MechMerlin2019-01-233-7/+14
| | * | | [Keymap] Adding keymap for Nyquist (#4918)shovelpaw2019-01-233-0/+202
| | * | | Optimize/Update the new_project script (#4920)MechMerlin2019-01-232-42/+1
| | * | | Remove lfkeyboards parent rules.mk as its only required for mini1800zvecr2019-01-232-1/+2
| | * | | [Keyboard] Add BDN9 (#4919)Danny2019-01-237-0/+216
| | * | | [Keyboard] Add KBD67 Hotswap Support (#4916)MechMerlin2019-01-2319-8/+544
| | * | | Fixup the clueboard 66 info.jsonskullY2019-01-234-11/+15
| | * | | Clueboard refresh (#4902)skullydazed2019-01-23101-4094/+583
| | * | | Give the keymap folder the proper namenoroadsleft2019-01-221-0/+0
| | * | | Fix layouts/default/66_iso keymapnoroadsleft2019-01-221-6/+6
| | * | | [Keyboard] Add DataHand keyboard support (#4847)Nikolaus Wittenstein2019-01-227-0/+733
| | * | | [Keymap] Add a compile-time provided macro and assign to _FL (#4908)Rys Sommefeldt2019-01-223-9/+27
| | * | | Added info.json for TGR AliceFelipe Coury2019-01-221-0/+12
| | * | | Always read two bytes from the endpoint if we have two bytes to readfauxpark2019-01-221-5/+1
| | * | | Rename i2c_slave functions so it can coexist with i2c_master (#4875)James Churchill2019-01-225-38/+36
| | * | | Fix for ISO layout in tada68:rys (#4906)Rys Sommefeldt2019-01-211-2/+2
| | * | | [Keyboard] Added TGR Alice keyboard support (#4896)Felipe Coury2019-01-219-0/+819
| | * | | handwired/retro_refit: refactor, Configurator support and readme update (#4899)noroadsleft2019-01-214-96/+155
| | * | | Initial fixes for vagrant (#4900)zvecr2019-01-211-13/+18
| | * | | Tidy up IS_{,HOST_}LED_{ON,OFF} macros (#4894)Konstantin Đorđević2019-01-202-29/+15
| | * | | [Keyboard] Tmo50 initial commit (#4891)Emīls Delle2019-01-207-0/+433
| | * | | Update Templates (stop living in the past, its 2019) (#4897)MechMerlin2019-01-208-8/+8
| | * | | Plain60 Configurator support and cleanup (#4888)noroadsleft2019-01-203-6/+82
| | * | | Add crd's do60 (#4889)Jason Thigpen2019-01-201-0/+33
| | * | | Added VIA Configurator support to Snagpad (#4890)Wilba2019-01-203-2/+176
| | * | | schaeferdev layout for hhkb implementing movement layer (VIM style + Mouse) (...Daniel Schäfer2019-01-194-0/+122
| | * | | handwired/reddot refactor, Configurator support and readme update (#4886)noroadsleft2019-01-194-56/+144
| | * | | Add Plain60 support (#4887)Maarten Dekkers2019-01-196-0/+200