Skip to content
Commit 393f03af authored by Mike Gabriel's avatar Mike Gabriel
Browse files

Merge branch 'master' of ssh://git.debian.org/git/users/osamu/libjpeg-turbo 

Conflicts (resolved by Mike Gabriel):
	debian/changelog
	debian/patches/FixLibraryStartup.patch
	debian/patches/tjunittest.patch
parents bd88ce77 ce4e51b3
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