Conflicts:
	INSTALL
	Makefile.am
	configure.ac
	debian/changelog
	debian/control
	debian/libzorpll5.0-0-memtrace.lintian-overrides
	debian/libzorpll5.0-0.config
	debian/libzorpll5.0-0.install
	debian/libzorpll5.0-0.postinst
	debian/libzorpll5.0-0.templates
	debian/rules
	m4/libtool.m4
	m4/ltoptions.m4
	m4/ltversion.m4
	m4/lt~obsolete.m4
	winbuild/win32/vs10/libzorpll.props
	winbuild/win32/vs10/libzorpll.sln
	winbuild/win32/vs10/libzorpll.vcxproj
	winbuild/win32/vs10/libzorpll.vcxproj.filters