]> git.donarmstrong.com Git - qmk_firmware.git/commit
Merge remote-tracking branch 'origin/master'
authorJack Humbert <jack.humb@gmail.com>
Fri, 22 Apr 2016 05:04:13 +0000 (01:04 -0400)
committerJack Humbert <jack.humb@gmail.com>
Fri, 22 Apr 2016 05:04:13 +0000 (01:04 -0400)
commita8086126fecbdce1c192036cf1011329d406949d
treeb00149e3808780b8a64fdd7240c207cd95028261
parentb1900c8dde2a68e87aaabd84280a99bf6658ea9f
parent082a0f313d8c842a5de7bae30ec8a3597e35880b
Merge remote-tracking branch 'origin/master'

# Conflicts:
# quantum/audio/voices.c
quantum/audio/voices.c
quantum/audio/voices.h