Skip to content
Commit 4dc50e1c authored by Ondřej Surý's avatar Ondřej Surý
Browse files

Merge tag 'upstream/1.5.1'

Upstream version 1.5.1

Conflicts:
	BUILDING.md
	CMakeLists.txt
	ChangeLog.md
	Makefile.am
	Makefile.in
	configure
	configure.ac
	jdarith.c
	jdmaster.c
	jdphuff.c
	jpegint.h
	simd/Makefile.am
	simd/Makefile.in
	simd/jsimd_arm64_neon.S
	simd/jsimd_mips.c
	simd/jsimd_powerpc.c
parents 53cfe0db 9394e3f9
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment