diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-04-22 07:04:13 +0200 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-04-22 07:04:13 +0200 |
| commit | a8086126fecbdce1c192036cf1011329d406949d (patch) | |
| tree | b00149e3808780b8a64fdd7240c207cd95028261 /quantum/audio/voices.h | |
| parent | b1900c8dde2a68e87aaabd84280a99bf6658ea9f (diff) | |
| parent | 082a0f313d8c842a5de7bae30ec8a3597e35880b (diff) | |
| download | qmk_firmware-a8086126fecbdce1c192036cf1011329d406949d.tar.gz qmk_firmware-a8086126fecbdce1c192036cf1011329d406949d.tar.xz | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# quantum/audio/voices.c
Diffstat (limited to 'quantum/audio/voices.h')
| -rw-r--r-- | quantum/audio/voices.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/quantum/audio/voices.h b/quantum/audio/voices.h index 718671f77..cdd14798b 100644 --- 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
\ No newline at end of file |