Public Git Hosting - jack2.git/commit

commit	1d5712a579cb9cb21792750ba47e8f9ec7b49c1c
author	Stéphane Letz <letz@macsteph.grame.fr>
	Wed, 10 Feb 2010 14:54:18 +0000 (10 15:54 +0100)
committer	Stéphane Letz <letz@macsteph.grame.fr>
	Wed, 10 Feb 2010 14:54:18 +0000 (10 15:54 +0100)
tree	fe17b454e0c92ef806f8204d654a46c6f1bbba43	tree \| snapshot (tar.gz zip)
parent	66c14ab5bfd41c452c90c7fe260d26ac34d0f765	commit \| diff
parent	d060e55d304404977d50765fa3606d55497001bc	commit \| diff

Fix merge conflicts.

JACK2 codebase

common/JackEngine.cpp	diff1 \|	diff2 \|	blob \| history
common/JackNetOneDriver.cpp	diff1 \|	diff2 \|	blob \| history
linux/firewire/JackFFADODriver.cpp	diff1 \|	diff2 \|	blob \| history
macosx/coreaudio/JackCoreAudioDriver.cpp	diff1 \|	diff2 \|	blob \| history