Skip to content
Commit ed8d9bcb authored by Adrian Knoth's avatar Adrian Knoth
Browse files

Merge branch 'master' of git://git.debian.org/git/pkg-multimedia/jackd2 

Conflicts:
	ChangeLog
	common/JackConstants.h
	debian/changelog
	wscript
parents 625705ad 94738340
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment