a
Merge branch 'master' of github.com:xingxux/image_compression

Conflicts:
	jpeg-9/.libs/jaricom.o
	jpeg-9/.libs/jcapimin.o
	jpeg-9/.libs/jcapistd.o
	jpeg-9/.libs/jcarith.o
	jpeg-9/.libs/jccoefct.o
	jpeg-9/.libs/jccolor.o
	jpeg-9/.libs/jcdctmgr.o
	jpeg-9/.libs/jchuff.o
	jpeg-9/.libs/jcinit.o
	jpeg-9/.libs/jcmarker.o
	jpeg-9/.libs/jcmaster.o
	jpeg-9/.libs/jcomapi.o
	jpeg-9/.libs/jcparam.o
	jpeg-9/.libs/jcprepct.o
	jpeg-9/.libs/jcsample.o
	jpeg-9/.libs/jctrans.o
	jpeg-9/.libs/jdapimin.o
	jpeg-9/.libs/jdapistd.o
	jpeg-9/.libs/jdarith.o
	jpeg-9/.libs/jdatadst.o
	jpeg-9/.libs/jdatasrc.o
	jpeg-9/.libs/jdcoefct.o
	jpeg-9/.libs/jdcolor.o
	jpeg-9/.libs/jddctmgr.o
	jpeg-9/.libs/jdhuff.o
	jpeg-9/.libs/jdinput.o
	jpeg-9/.libs/jdmainct.o
	jpeg-9/.libs/jdmarker.o
	jpeg-9/.libs/jdmaster.o
	jpeg-9/.libs/jdmerge.o
	jpeg-9/.libs/jdpostct.o
	jpeg-9/.libs/jdsample.o
	jpeg-9/.libs/jdtrans.o
	jpeg-9/.libs/jerror.o
	jpeg-9/.libs/jfdctflt.o
	jpeg-9/.libs/jfdctint.o
	jpeg-9/.libs/jidctflt.o
	jpeg-9/.libs/jidctfst.o
	jpeg-9/.libs/jidctint.o
	jpeg-9/.libs/jmemmgr.o
	jpeg-9/.libs/jmemnobs.o
	jpeg-9/.libs/jquant1.o
	jpeg-9/.libs/jquant2.o
	jpeg-9/.libs/jutils.o
	jpeg-9/.libs/libjpeg.a
	jpeg-9/.libs/libjpeg.so.9.0.0
	jpeg-9/Makefile
	jpeg-9/cjpeg
	jpeg-9/config.log
	jpeg-9/djpeg
	jpeg-9/jpegtran
a
abc
Merge branch 'master' of github.com:xingxux/image_compression
a