drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	quantum/audio/voices.c
This commit is contained in:
Jack Humbert 2016-04-22 01:04:13 -04:00
commit a8086126fe
5 changed files with 85 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
quantum/audio/voices.h
View file

@ -22,7 +22,7 @@ typedef enum {
} voice_type;
void set_voice(voice_type v);
void voice_iterate();
void voice_deiterate();
void voice_iterate(void);
void voice_deiterate(void);
#endif