commit 668d03699c8fd729c728fc2e7a6b8e21e7a815d1
Merge: 37ea28a4 f6581c53
Author:     Alex Mayfield <alexmax2742@gmail.com>
AuthorDate: Sun Feb 26 17:27:45 2017 -0500
Commit:     Alex Mayfield <alexmax2742@gmail.com>
CommitDate: Sun Feb 26 17:27:45 2017 -0500

    Merge remote-tracking branch 'chungy/chocolate-midivolume' into chocolate-midivolume

 midiproc/Makefile.am  | 6 +++---
 pkg/win32/GNUmakefile | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)