Merge remote-tracking branch 'origin/master'

# Conflicts: # quantum/audio/voices.c
2016-04-22 01:04:13 -04:00
parent b1900c8dde 082a0f313d
commit a8086126fe
5 changed files with 85 additions and 39 deletions
--- a/quantum/audio/voices.h
+++ b/quantum/audio/voices.h
@@ -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