merge from master

This commit is contained in:
Jack Humbert
2018-05-10 15:01:26 -04:00
786 changed files with 41749 additions and 6638 deletions

View File

@@ -13,8 +13,6 @@
}
#endif
#define MUSIC_MASK (keycode != KC_NO)
/*
* MIDI options
*/
@@ -39,7 +37,6 @@
/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
//#define MIDI_TONE_KEYCODE_OCTAVES 2
// Most tactile encoders have detents every 4 stages
#define ENCODER_RESOLUTION 4