Merge branch 'master' into iosaudioaccessory

Conflicts:
	module_usb_aud_shared/clocking/clocking.h
	module_usb_aud_shared/usb_buffer/decouple.xc
	module_usb_aud_shared/usb_buffer/usb_buffer.xc
	module_usb_midi/src/usb_midi.xc
This commit is contained in:
Ross Owen
2012-02-21 16:46:30 +00:00

View File

@@ -1,6 +1,7 @@
#ifndef __usb_midi_h__
#define __usb_midi_h__
#include "devicedefines.h"
/** USB MIDI I/O thread.
*