Paul Davis c7af2444a7 Merge branch 'master' into ardour-merge ... Conflicts: gtk2_ardour/time_axis_view_item.cc libs/backends/wavesaudio/waves_audiobackend.h libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp		2014-09-02 10:28:52 -04:00
..
akupara	new audio engine backend for native CoreAudio audio I/O, and PortMIDI for MIDI.	2014-02-24 14:49:13 -05:00
BasicTypes	alter platform-dependent preprocessor macros to use the same names as the rest of the ardour codebase	2014-08-16 16:29:07 -04:00
devicemanager	Merge branch 'master' into ardour-merge	2014-09-02 10:28:52 -04:00
miscutils	outline portable implementation to replace clock_gettime()	2014-08-16 16:49:11 -04:00
refmanager	[P4/git history rebuild]	2014-05-27 22:51:09 -04:00
threads	'atomic_ops' to use glib, rather than Waves's inbuilt atomic operations	2014-08-16 16:34:40 -04:00
wavespublicapi	Add some type guards to 'wstdint.h' (in case we previously #included some headers which already define those types)	2014-08-16 16:33:27 -04:00