From: Yuya ENOKIDA Date: Sun, 30 Jan 2022 02:13:06 +0000 (+0900) Subject: Merge remote-tracking branch 'refs/remotes/origin/master' X-Git-Url: http://git.osdn.net/view?p=eos%2FhostdependX86LINUX64.git;a=commitdiff_plain;h=d434b6dea8c8f0ad0355095fcb30bb72daba677a Merge remote-tracking branch 'refs/remotes/origin/master' Conflicts: bin/X86LINUX64/mrc2bild bin/X86LINUX64/mrcImageCurl bin/X86LINUX64/mrcImageDivergence bin/X86LINUX64/mrcImageOpticalFlow bin/X86LINUX64/mrcImageSuperResolutionByOpticalFlow lib/X86LINUX64/libEosObjects.a lib/X86LINUX64/libEosObjects.so lib/X86LINUX64/libbildFile.a lib/X86LINUX64/libbildFile.so lib/X86LINUX64/shared/lmrc2bild.sharedo src/Objects/DataManip/bildFile/src/X86LINUX64/libbildFile.a src/Objects/DataManip/bildFile/src/X86LINUX64/libbildFile.debug.a src/Objects/DataManip/bildFile/src/X86LINUX64/libbildFile.so src/Objects/DataManip/bildFile/src/X86LINUX64/lmrc2bild.debugo src/Objects/DataManip/bildFile/src/X86LINUX64/lmrc2bild.o src/Objects/DataManip/bildFile/src/X86LINUX64/lmrc2bild.sharedo src/Tools/filter/mrc2bild/src/X86LINUX64/mrc2bild src/Tools/filter/mrc2bild/src/X86LINUX64/usage.o src/Tools/mrcImage/mrcImageCurl/src/X86LINUX64/.Depend src/Tools/mrcImage/mrcImageCurl/src/X86LINUX64/mrcImageCurl src/Tools/mrcImage/mrcImageDivergence/src/X86LINUX64/.Depend src/Tools/mrcImage/mrcImageDivergence/src/X86LINUX64/mrcImageDivergence src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/.Depend src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/mrcImageOpticalFlow src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/X86LINUX64/.Depend src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/X86LINUX64/mrcImageSuperResolutionByOpticalFlow It looks like you may be committing a merge. If this is not correct, please remove the file .git/MERGE_HEAD and try again. Please enter the commit message for your changes. Lines starting with '#' will be ignored, and an empty message aborts the commit. Committer: Yuya ENOKIDA On branch master Your branch and 'origin/master' have diverged, and have 1 and 2 different commits each, respectively. (use "git pull" to merge the remote branch into yours) All conflicts fixed but you are still merging. Changes to be committed: new file: bin/X86LINUX64/.nfs000000000f278ceb000000c7 modified: bin/X86LINUX64/eosMathAverage modified: bin/X86LINUX64/eosMathMedian modified: bin/X86LINUX64/eosMathSorting modified: bin/X86LINUX64/mrcFFTExpression modified: bin/X86LINUX64/mrcImageAddValue modified: bin/X86LINUX64/mrcImageBackgroundSubtraction modified: bin/X86LINUX64/mrcImageDeconvolution modified: bin/X86LINUX64/mrcImageFFT new file: bin/X86LINUX64/mrcImageGradient modified: bin/X86LINUX64/mrcImagePixelDataGet new file: bin/X86LINUX64/mrcImageStreamLine modified: bin/X86LINUX64/mrcImageSymmetryAverage modified: bin/X86LINUX64/mrcImageSymmetryCentreFind modified: bin/X86LINUX64/mrcImageSymmetryFind modified: bin/X86LINUX64/pdb2mrc2d modified: bin/X86LINUX64/pdb2mrc2dWithCTF modified: bin/X86LINUX64/pdbChargeFit modified: bin/X86LINUX64/pdbCrystalCreate modified: bin/X86LINUX64/pdbHelix modified: bin/X86LINUX64/pdbMatrixCreate modified: bin/X86LINUX64/pdbMove modified: bin/X86LINUX64/pdbPCA modified: bin/X86LINUX64/pdbRotation modified: bin/X86LINUX64/pdbShapeFit modified: bin/X86LINUX64/pdbTwoProteinFit modified: bin/X86LINUX64/tiff2mrc modified: lib/X86LINUX64/libAI.a modified: lib/X86LINUX64/libArray.a modified: lib/X86LINUX64/libCluster.a modified: lib/X86LINUX64/libContour.a modified: lib/X86LINUX64/libCrystal.a modified: lib/X86LINUX64/libDCDFile.a modified: lib/X86LINUX64/libMap2D.a modified: lib/X86LINUX64/libMatrix3D.a modified: lib/X86LINUX64/libMemory.a modified: lib/X86LINUX64/libPVM.a modified: lib/X86LINUX64/libRandom.a modified: lib/X86LINUX64/libSocket.a modified: lib/X86LINUX64/libSpecialNumber.a modified: lib/X86LINUX64/libVector.a modified: lib/X86LINUX64/libavsFile.a modified: lib/X86LINUX64/libbmpFile.a modified: lib/X86LINUX64/libctfInfo.a modified: lib/X86LINUX64/libdmFile.a modified: lib/X86LINUX64/libdsn6File.a modified: lib/X86LINUX64/libdummy.a modified: lib/X86LINUX64/libemData.a modified: lib/X86LINUX64/libeosAlsa.a modified: lib/X86LINUX64/libeosBayes.a modified: lib/X86LINUX64/libeosCuda.a modified: lib/X86LINUX64/libeosCuda.so modified: lib/X86LINUX64/libeosFunc.a modified: lib/X86LINUX64/libeosMath.a modified: lib/X86LINUX64/libeosMath.so modified: lib/X86LINUX64/libeosOpenGL.a modified: lib/X86LINUX64/libeosPThread.a modified: lib/X86LINUX64/libeosPoint.a modified: lib/X86LINUX64/libeosString.a modified: lib/X86LINUX64/libhf2000.a modified: lib/X86LINUX64/libllData.a modified: lib/X86LINUX64/libltlgData.a modified: lib/X86LINUX64/libmapFile.a modified: lib/X86LINUX64/libmrcImageShape.a modified: lib/X86LINUX64/libpngFile.a modified: lib/X86LINUX64/libpsFile.a modified: lib/X86LINUX64/libsimulation.a modified: lib/X86LINUX64/libtgaFile.a modified: lib/X86LINUX64/libtransform.a modified: lib/X86LINUX64/shared/eosCuda.sharedo modified: lib/X86LINUX64/shared/eosMathStatistics.sharedo modified: lib/X86LINUX64/shared/lmrcFFTExpression.sharedo modified: lib/X86LINUX64/shared/lmrcImageAddValueCuda.sharedo modified: lib/X86LINUX64/shared/mrcImageGetPixelsCUDA.sharedo modified: src/Objects/DataExpress/Contour/src/X86LINUX64/libContour.a modified: src/Objects/DataExpress/Contour/src/X86LINUX64/libContour.debug.a modified: src/Objects/DataExpress/avsFile/src/X86LINUX64/libavsFile.a modified: src/Objects/DataExpress/avsFile/src/X86LINUX64/libavsFile.debug.a modified: src/Objects/DataExpress/eosAlsa/src/X86LINUX64/libeosAlsa.a modified: src/Objects/DataExpress/eosAlsa/src/X86LINUX64/libeosAlsa.debug.a modified: src/Objects/DataExpress/eosOpenGL/src/X86LINUX64/libeosOpenGL.a modified: src/Objects/DataExpress/eosOpenGL/src/X86LINUX64/libeosOpenGL.debug.a modified: src/Objects/DataExpress/pngFile/src/X86LINUX64/libpngFile.a modified: src/Objects/DataExpress/pngFile/src/X86LINUX64/libpngFile.debug.a modified: src/Objects/DataExpress/psFile/src/X86LINUX64/libpsFile.a modified: src/Objects/DataExpress/psFile/src/X86LINUX64/libpsFile.debug.a modified: src/Objects/DataManip/DCDFile/src/X86LINUX64/libDCDFile.a modified: src/Objects/DataManip/DCDFile/src/X86LINUX64/libDCDFile.debug.a modified: src/Objects/DataManip/bmpFile/src/X86LINUX64/libbmpFile.a modified: src/Objects/DataManip/bmpFile/src/X86LINUX64/libbmpFile.debug.a modified: src/Objects/DataManip/ctfInfo/src/X86LINUX64/libctfInfo.a modified: src/Objects/DataManip/ctfInfo/src/X86LINUX64/libctfInfo.debug.a modified: src/Objects/DataManip/dmFile/src/X86LINUX64/libdmFile.a modified: src/Objects/DataManip/dmFile/src/X86LINUX64/libdmFile.debug.a modified: src/Objects/DataManip/dsn6File/src/X86LINUX64/libdsn6File.a modified: src/Objects/DataManip/dsn6File/src/X86LINUX64/libdsn6File.debug.a modified: src/Objects/DataManip/emData/src/X86LINUX64/libemData.a modified: src/Objects/DataManip/emData/src/X86LINUX64/libemData.debug.a modified: src/Objects/DataManip/llData/src/X86LINUX64/libllData.a modified: src/Objects/DataManip/llData/src/X86LINUX64/libllData.debug.a modified: src/Objects/DataManip/ltlgData/src/X86LINUX64/libltlgData.a modified: src/Objects/DataManip/ltlgData/src/X86LINUX64/libltlgData.debug.a modified: src/Objects/DataManip/mapFile/src/X86LINUX64/libmapFile.a modified: src/Objects/DataManip/mapFile/src/X86LINUX64/libmapFile.debug.a modified: src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcFFTExpression.debugo modified: src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcFFTExpression.o modified: src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcFFTExpression.sharedo modified: src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageAddValueCuda.o modified: src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageAddValueCuda.sharedo modified: src/Objects/DataManip/mrcImage/src/X86LINUX64/mrcImageGetPixelsCUDA.o modified: src/Objects/DataManip/mrcImage/src/X86LINUX64/mrcImageGetPixelsCUDA.sharedo modified: src/Objects/DataManip/mrcImageShape/src/X86LINUX64/libmrcImageShape.a modified: src/Objects/DataManip/mrcImageShape/src/X86LINUX64/libmrcImageShape.debug.a modified: src/Objects/DataManip/pdbFile/src/X86LINUX64/libpdbFile.debug.a modified: src/Objects/DataManip/simulation/src/X86LINUX64/libsimulation.a modified: src/Objects/DataManip/simulation/src/X86LINUX64/libsimulation.debug.a modified: src/Objects/DataManip/tgaFile/src/X86LINUX64/libtgaFile.a modified: src/Objects/DataManip/tgaFile/src/X86LINUX64/libtgaFile.debug.a modified: src/Objects/DataManip/transform/src/X86LINUX64/libtransform.a modified: src/Objects/DataManip/transform/src/X86LINUX64/libtransform.debug.a modified: src/Objects/General/AI/src/X86LINUX64/libAI.a modified: src/Objects/General/AI/src/X86LINUX64/libAI.debug.a modified: src/Objects/General/Array/src/X86LINUX64/libArray.a modified: src/Objects/General/Array/src/X86LINUX64/libArray.debug.a modified: src/Objects/General/Cluster/src/X86LINUX64/libCluster.a modified: src/Objects/General/Cluster/src/X86LINUX64/libCluster.debug.a modified: src/Objects/General/Crystal/src/X86LINUX64/libCrystal.a modified: src/Objects/General/Crystal/src/X86LINUX64/libCrystal.debug.a modified: src/Objects/General/Map2D/src/X86LINUX64/libMap2D.a modified: src/Objects/General/Map2D/src/X86LINUX64/libMap2D.debug.a modified: src/Objects/General/Matrix3D/src/X86LINUX64/libMatrix3D.a modified: src/Objects/General/Matrix3D/src/X86LINUX64/libMatrix3D.debug.a modified: src/Objects/General/Memory/src/X86LINUX64/libMemory.a modified: src/Objects/General/Memory/src/X86LINUX64/libMemory.debug.a modified: src/Objects/General/PVM/src/X86LINUX64/libPVM.a modified: src/Objects/General/PVM/src/X86LINUX64/libPVM.debug.a modified: src/Objects/General/Random/src/X86LINUX64/libRandom.a modified: src/Objects/General/Random/src/X86LINUX64/libRandom.debug.a modified: src/Objects/General/Socket/src/X86LINUX64/libSocket.a modified: src/Objects/General/Socket/src/X86LINUX64/libSocket.debug.a modified: src/Objects/General/SpecialNumber/src/X86LINUX64/libSpecialNumber.a modified: src/Objects/General/SpecialNumber/src/X86LINUX64/libSpecialNumber.debug.a modified: src/Objects/General/Vector/src/X86LINUX64/libVector.a modified: src/Objects/General/Vector/src/X86LINUX64/libVector.debug.a modified: src/Objects/General/dummy/src/X86LINUX64/libdummy.a modified: src/Objects/General/dummy/src/X86LINUX64/libdummy.debug.a modified: src/Objects/General/eosBayes/src/X86LINUX64/libeosBayes.a modified: src/Objects/General/eosBayes/src/X86LINUX64/libeosBayes.debug.a modified: src/Objects/General/eosCuda/src/X86LINUX64/eosCuda.o modified: src/Objects/General/eosCuda/src/X86LINUX64/eosCuda.sharedo modified: src/Objects/General/eosCuda/src/X86LINUX64/libeosCuda.a modified: src/Objects/General/eosCuda/src/X86LINUX64/libeosCuda.so modified: src/Objects/General/eosFunc/src/X86LINUX64/libeosFunc.a modified: src/Objects/General/eosFunc/src/X86LINUX64/libeosFunc.debug.a modified: src/Objects/General/eosMath/src/X86LINUX64/eosMathStatistics.debugo modified: src/Objects/General/eosMath/src/X86LINUX64/eosMathStatistics.o modified: src/Objects/General/eosMath/src/X86LINUX64/eosMathStatistics.sharedo modified: src/Objects/General/eosMath/src/X86LINUX64/libeosMath.a modified: src/Objects/General/eosMath/src/X86LINUX64/libeosMath.debug.a modified: src/Objects/General/eosMath/src/X86LINUX64/libeosMath.so modified: src/Objects/General/eosPThread/src/X86LINUX64/libeosPThread.a modified: src/Objects/General/eosPThread/src/X86LINUX64/libeosPThread.debug.a modified: src/Objects/General/eosPoint/src/X86LINUX64/libeosPoint.a modified: src/Objects/General/eosPoint/src/X86LINUX64/libeosPoint.debug.a modified: src/Objects/General/eosString/src/X86LINUX64/libeosString.a modified: src/Objects/General/eosString/src/X86LINUX64/libeosString.debug.a modified: src/Objects/MachineManip/hf2000/src/X86LINUX64/libhf2000.a modified: src/Objects/MachineManip/hf2000/src/X86LINUX64/libhf2000.debug.a modified: src/Tools/eosMath/eosMathAverage/src/X86LINUX64/eosMathAverage modified: src/Tools/eosMath/eosMathAverage/src/X86LINUX64/eosMathAverage.o modified: src/Tools/eosMath/eosMathMedian/src/X86LINUX64/eosMathMedian modified: src/Tools/eosMath/eosMathSorting/src/X86LINUX64/eosMathSorting new file: src/Tools/filter/mrc2hdf/src/X86LINUX64/.Depend new file: src/Tools/filter/mrc2hdf/src/X86LINUX64/Makefile new file: src/Tools/filter/mrc2hdf/src/X86LINUX64/X86LINUX64 new file: src/Tools/filter/mrc2hdf/src/X86LINUX64/argCheck.o new file: src/Tools/filter/mrc2hdf/src/X86LINUX64/init.o new file: src/Tools/filter/mrc2hdf/src/X86LINUX64/usage.o new file: src/Tools/filter/mrc2hdf/src/X86LINUX64/util.o modified: src/Tools/filter/tiff2mrc/src/X86LINUX64/tiff2mrc modified: src/Tools/filter/tiff2mrc/src/X86LINUX64/tiff2mrc.o modified: src/Tools/mrcImage/mrcFFTExpression/src/X86LINUX64/mrcFFTExpression modified: src/Tools/mrcImage/mrcImageAddValue/src/X86LINUX64/mrcImageAddValue modified: src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/X86LINUX64/mrcImageBackgroundSubtraction modified: src/Tools/mrcImage/mrcImageCurl/src/X86LINUX64/.Depend new file: src/Tools/mrcImage/mrcImageCurl/src/X86LINUX64/X86LINUX64 modified: src/Tools/mrcImage/mrcImageDeconvolution/src/X86LINUX64/mrcImageDeconvolution modified: src/Tools/mrcImage/mrcImageDivergence/src/X86LINUX64/.Depend new file: src/Tools/mrcImage/mrcImageDivergence/src/X86LINUX64/X86LINUX64 modified: src/Tools/mrcImage/mrcImageFFT/src/X86LINUX64/mrcImageFFT new file: src/Tools/mrcImage/mrcImageGradient/src/X86LINUX64/.Depend new file: src/Tools/mrcImage/mrcImageGradient/src/X86LINUX64/Makefile new file: src/Tools/mrcImage/mrcImageGradient/src/X86LINUX64/X86LINUX64 new file: src/Tools/mrcImage/mrcImageGradient/src/X86LINUX64/argCheck.o new file: src/Tools/mrcImage/mrcImageGradient/src/X86LINUX64/init.o new file: src/Tools/mrcImage/mrcImageGradient/src/X86LINUX64/mrcImageGradient new file: src/Tools/mrcImage/mrcImageGradient/src/X86LINUX64/mrcImageGradient.o new file: src/Tools/mrcImage/mrcImageGradient/src/X86LINUX64/usage.o new file: src/Tools/mrcImage/mrcImageGradient/src/X86LINUX64/util.o modified: src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/.Depend new file: src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/X86LINUX64 modified: src/Tools/mrcImage/mrcImagePad/src/X86LINUX64/.Depend deleted: src/Tools/mrcImage/mrcImagePad/src/X86LINUX64/mrcImagePad modified: src/Tools/mrcImage/mrcImagePixelDataGet/src/X86LINUX64/mrcImagePixelDataGet new file: src/Tools/mrcImage/mrcImageStreamLine/src/X86LINUX64/.Depend new file: src/Tools/mrcImage/mrcImageStreamLine/src/X86LINUX64/Makefile new file: src/Tools/mrcImage/mrcImageStreamLine/src/X86LINUX64/X86LINUX64 new file: src/Tools/mrcImage/mrcImageStreamLine/src/X86LINUX64/argCheck.o new file: src/Tools/mrcImage/mrcImageStreamLine/src/X86LINUX64/init.o new file: src/Tools/mrcImage/mrcImageStreamLine/src/X86LINUX64/mrcImageStreamLine new file: src/Tools/mrcImage/mrcImageStreamLine/src/X86LINUX64/mrcImageStreamLine.o new file: src/Tools/mrcImage/mrcImageStreamLine/src/X86LINUX64/usage.o new file: src/Tools/mrcImage/mrcImageStreamLine/src/X86LINUX64/util.o modified: src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/X86LINUX64/.Depend new file: src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/X86LINUX64/X86LINUX64 modified: src/Tools/mrcImage/mrcImageSymmetryAverage/src/X86LINUX64/mrcImageSymmetryAverage modified: src/Tools/mrcImage/mrcImageSymmetryCentreFind/src/X86LINUX64/mrcImageSymmetryCentreFind modified: src/Tools/mrcImage/mrcImageSymmetryFind/src/X86LINUX64/mrcImageSymmetryFind modified: src/Tools/pdbUtil/pdb2mrc2d/src/X86LINUX64/pdb2mrc2d modified: src/Tools/pdbUtil/pdb2mrc2dWithCTF/src/X86LINUX64/pdb2mrc2dWithCTF modified: src/Tools/pdbUtil/pdbChargeFit/src/X86LINUX64/pdbChargeFit modified: src/Tools/pdbUtil/pdbCrystalCreate/src/X86LINUX64/pdbCrystalCreate modified: src/Tools/pdbUtil/pdbHelix/src/X86LINUX64/pdbHelix modified: src/Tools/pdbUtil/pdbMatrixCreate/src/X86LINUX64/pdbMatrixCreate modified: src/Tools/pdbUtil/pdbMove/src/X86LINUX64/pdbMove modified: src/Tools/pdbUtil/pdbPCA/src/X86LINUX64/pdbPCA modified: src/Tools/pdbUtil/pdbRotation/src/X86LINUX64/pdbRotation modified: src/Tools/pdbUtil/pdbShapeFit/src/X86LINUX64/pdbShapeFit modified: src/Tools/pdbUtil/pdbTwoProteinFit/src/X86LINUX64/pdbTwoProteinFit modified: util/X86LINUX64/bin/gsl-config modified: util/X86LINUX64/bin/gsl-histogram modified: util/X86LINUX64/bin/gsl-randist modified: util/X86LINUX64/include/gsl/gsl_bspline.h new file: util/X86LINUX64/include/gsl/gsl_bst.h new file: util/X86LINUX64/include/gsl/gsl_bst_avl.h new file: util/X86LINUX64/include/gsl/gsl_bst_rb.h new file: util/X86LINUX64/include/gsl/gsl_bst_types.h modified: util/X86LINUX64/include/gsl/gsl_chebyshev.h modified: util/X86LINUX64/include/gsl/gsl_complex.h modified: util/X86LINUX64/include/gsl/gsl_dht.h new file: util/X86LINUX64/include/gsl/gsl_filter.h modified: util/X86LINUX64/include/gsl/gsl_inline.h modified: util/X86LINUX64/include/gsl/gsl_integration.h modified: util/X86LINUX64/include/gsl/gsl_interp.h new file: util/X86LINUX64/include/gsl/gsl_interp2d.h modified: util/X86LINUX64/include/gsl/gsl_linalg.h modified: util/X86LINUX64/include/gsl/gsl_matrix_char.h modified: util/X86LINUX64/include/gsl/gsl_matrix_complex_double.h modified: util/X86LINUX64/include/gsl/gsl_matrix_complex_float.h modified: util/X86LINUX64/include/gsl/gsl_matrix_complex_long_double.h modified: util/X86LINUX64/include/gsl/gsl_matrix_double.h modified: util/X86LINUX64/include/gsl/gsl_matrix_float.h modified: util/X86LINUX64/include/gsl/gsl_matrix_int.h modified: util/X86LINUX64/include/gsl/gsl_matrix_long.h modified: util/X86LINUX64/include/gsl/gsl_matrix_long_double.h modified: util/X86LINUX64/include/gsl/gsl_matrix_short.h modified: util/X86LINUX64/include/gsl/gsl_matrix_uchar.h modified: util/X86LINUX64/include/gsl/gsl_matrix_uint.h modified: util/X86LINUX64/include/gsl/gsl_matrix_ulong.h modified: util/X86LINUX64/include/gsl/gsl_matrix_ushort.h modified: util/X86LINUX64/include/gsl/gsl_monte.h new file: util/X86LINUX64/include/gsl/gsl_movstat.h modified: util/X86LINUX64/include/gsl/gsl_multifit.h modified: util/X86LINUX64/include/gsl/gsl_multifit_nlin.h new file: util/X86LINUX64/include/gsl/gsl_multifit_nlinear.h new file: util/X86LINUX64/include/gsl/gsl_multilarge.h new file: util/X86LINUX64/include/gsl/gsl_multilarge_nlinear.h new file: util/X86LINUX64/include/gsl/gsl_permute_matrix.h new file: util/X86LINUX64/include/gsl/gsl_permute_matrix_char.h new file: util/X86LINUX64/include/gsl/gsl_permute_matrix_complex_double.h new file: util/X86LINUX64/include/gsl/gsl_permute_matrix_complex_float.h new file: util/X86LINUX64/include/gsl/gsl_permute_matrix_complex_long_double.h new file: util/X86LINUX64/include/gsl/gsl_permute_matrix_double.h new file: util/X86LINUX64/include/gsl/gsl_permute_matrix_float.h new file: util/X86LINUX64/include/gsl/gsl_permute_matrix_int.h new file: util/X86LINUX64/include/gsl/gsl_permute_matrix_long.h new file: util/X86LINUX64/include/gsl/gsl_permute_matrix_long_double.h new file: util/X86LINUX64/include/gsl/gsl_permute_matrix_short.h new file: util/X86LINUX64/include/gsl/gsl_permute_matrix_uchar.h new file: util/X86LINUX64/include/gsl/gsl_permute_matrix_uint.h new file: util/X86LINUX64/include/gsl/gsl_permute_matrix_ulong.h new file: util/X86LINUX64/include/gsl/gsl_permute_matrix_ushort.h modified: util/X86LINUX64/include/gsl/gsl_randist.h new file: util/X86LINUX64/include/gsl/gsl_rstat.h modified: util/X86LINUX64/include/gsl/gsl_sf.h modified: util/X86LINUX64/include/gsl/gsl_sf_ellint.h new file: util/X86LINUX64/include/gsl/gsl_sf_hermite.h modified: util/X86LINUX64/include/gsl/gsl_sf_legendre.h modified: util/X86LINUX64/include/gsl/gsl_sf_mathieu.h new file: util/X86LINUX64/include/gsl/gsl_sf_sincos_pi.h new file: util/X86LINUX64/include/gsl/gsl_spblas.h new file: util/X86LINUX64/include/gsl/gsl_splinalg.h new file: util/X86LINUX64/include/gsl/gsl_spline2d.h new file: util/X86LINUX64/include/gsl/gsl_spmatrix.h new file: util/X86LINUX64/include/gsl/gsl_spmatrix_char.h new file: util/X86LINUX64/include/gsl/gsl_spmatrix_complex_double.h new file: util/X86LINUX64/include/gsl/gsl_spmatrix_complex_float.h new file: util/X86LINUX64/include/gsl/gsl_spmatrix_complex_long_double.h new file: util/X86LINUX64/include/gsl/gsl_spmatrix_double.h new file: util/X86LINUX64/include/gsl/gsl_spmatrix_float.h new file: util/X86LINUX64/include/gsl/gsl_spmatrix_int.h new file: util/X86LINUX64/include/gsl/gsl_spmatrix_long.h new file: util/X86LINUX64/include/gsl/gsl_spmatrix_long_double.h new file: util/X86LINUX64/include/gsl/gsl_spmatrix_short.h new file: util/X86LINUX64/include/gsl/gsl_spmatrix_uchar.h new file: util/X86LINUX64/include/gsl/gsl_spmatrix_uint.h new file: util/X86LINUX64/include/gsl/gsl_spmatrix_ulong.h new file: util/X86LINUX64/include/gsl/gsl_spmatrix_ushort.h modified: util/X86LINUX64/include/gsl/gsl_statistics_char.h modified: util/X86LINUX64/include/gsl/gsl_statistics_double.h modified: util/X86LINUX64/include/gsl/gsl_statistics_float.h modified: util/X86LINUX64/include/gsl/gsl_statistics_int.h modified: util/X86LINUX64/include/gsl/gsl_statistics_long.h modified: util/X86LINUX64/include/gsl/gsl_statistics_long_double.h modified: util/X86LINUX64/include/gsl/gsl_statistics_short.h modified: util/X86LINUX64/include/gsl/gsl_statistics_uchar.h modified: util/X86LINUX64/include/gsl/gsl_statistics_uint.h modified: util/X86LINUX64/include/gsl/gsl_statistics_ulong.h modified: util/X86LINUX64/include/gsl/gsl_statistics_ushort.h modified: util/X86LINUX64/include/gsl/gsl_vector_char.h modified: util/X86LINUX64/include/gsl/gsl_vector_complex_double.h modified: util/X86LINUX64/include/gsl/gsl_vector_complex_float.h modified: util/X86LINUX64/include/gsl/gsl_vector_complex_long_double.h modified: util/X86LINUX64/include/gsl/gsl_vector_double.h modified: util/X86LINUX64/include/gsl/gsl_vector_float.h modified: util/X86LINUX64/include/gsl/gsl_vector_int.h modified: util/X86LINUX64/include/gsl/gsl_vector_long.h modified: util/X86LINUX64/include/gsl/gsl_vector_long_double.h modified: util/X86LINUX64/include/gsl/gsl_vector_short.h modified: util/X86LINUX64/include/gsl/gsl_vector_uchar.h modified: util/X86LINUX64/include/gsl/gsl_vector_uint.h modified: util/X86LINUX64/include/gsl/gsl_vector_ulong.h modified: util/X86LINUX64/include/gsl/gsl_vector_ushort.h modified: util/X86LINUX64/include/gsl/gsl_version.h new file: util/X86LINUX64/include/gsl/test_source.c modified: util/X86LINUX64/lib/libgsl.a modified: util/X86LINUX64/lib/libgsl.la modified: util/X86LINUX64/lib/libgsl.so new file: util/X86LINUX64/lib/libgsl.so.25 new file: util/X86LINUX64/lib/libgsl.so.25.1.0 modified: util/X86LINUX64/lib/libgslcblas.a modified: util/X86LINUX64/lib/libgslcblas.la modified: util/X86LINUX64/lib/libgslcblas.so.0.0.0 modified: util/X86LINUX64/lib/pkgconfig/gsl.pc modified: util/X86LINUX64/share/info/gsl-ref.info --- d434b6dea8c8f0ad0355095fcb30bb72daba677a diff --cc bin/X86LINUX64/.nfs000000000f278ceb000000c7 index 0000000000,0000000000..850bd0ba23 new file mode 100755 Binary files differ diff --cc src/Tools/mrcImage/mrcImageCurl/src/X86LINUX64/.Depend index b591f02a69,6c8f3ac972..172a589527 --- a/src/Tools/mrcImage/mrcImageCurl/src/X86LINUX64/.Depend +++ b/src/Tools/mrcImage/mrcImageCurl/src/X86LINUX64/.Depend @@@ -20,7 -20,7 +20,11 @@@ argCheck.o: argCheck.c /usr/include/std /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ /usr/include/bits/mathcalls.h ../inc/config.h \ ++<<<<<<< HEAD + ../inc/../inc/mrcImageCurl.h /home/enokida/Eos/include/genUtil.h \ ++======= + ../inc/../inc/mrcImageCurl.h /home/tacyas/Eos/include/genUtil.h \ ++>>>>>>> refs/remotes/origin/master /usr/include/values.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/limits.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/syslimits.h \ @@@ -28,8 -28,8 +32,13 @@@ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/float.h \ ++<<<<<<< HEAD + /home/enokida/Eos/include/eosString.h /home/enokida/Eos/include/File.h \ + /home/enokida/Eos/include/Memory.h ++======= + /home/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \ + /home/tacyas/Eos/include/Memory.h ++>>>>>>> refs/remotes/origin/master init.o: init.c /usr/include/stdc-predef.h /usr/include/stdio.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ @@@ -52,7 -52,7 +61,11 @@@ /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ /usr/include/bits/mathcalls.h ../inc/config.h \ ++<<<<<<< HEAD + ../inc/../inc/mrcImageCurl.h /home/enokida/Eos/include/genUtil.h \ ++======= + ../inc/../inc/mrcImageCurl.h /home/tacyas/Eos/include/genUtil.h \ ++>>>>>>> refs/remotes/origin/master /usr/include/values.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/limits.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/syslimits.h \ @@@ -60,8 -60,8 +73,13 @@@ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/float.h \ ++<<<<<<< HEAD + /home/enokida/Eos/include/eosString.h /home/enokida/Eos/include/File.h \ + /home/enokida/Eos/include/Memory.h ++======= + /home/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \ + /home/tacyas/Eos/include/Memory.h ++>>>>>>> refs/remotes/origin/master mrcImageCurl.o: mrcImageCurl.c /usr/include/stdc-predef.h \ /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ @@@ -84,7 -84,7 +102,11 @@@ /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ /usr/include/bits/mathcalls.h ../inc/config.h \ ++<<<<<<< HEAD + ../inc/../inc/mrcImageCurl.h /home/enokida/Eos/include/genUtil.h \ ++======= + ../inc/../inc/mrcImageCurl.h /home/tacyas/Eos/include/genUtil.h \ ++>>>>>>> refs/remotes/origin/master /usr/include/values.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/limits.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/syslimits.h \ @@@ -92,9 -92,9 +114,15 @@@ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/float.h \ ++<<<<<<< HEAD + /home/enokida/Eos/include/mrcImage.h /home/enokida/Eos/include/genUtil.h \ + /home/enokida/Eos/include/Matrix3D.h /home/enokida/Eos/include/Vector.h \ + /home/enokida/Eos/include/Array.h /home/enokida/Eos/include/ctfInfo.h ++======= + /home/tacyas/Eos/include/mrcImage.h /home/tacyas/Eos/include/genUtil.h \ + /home/tacyas/Eos/include/Matrix3D.h /home/tacyas/Eos/include/Vector.h \ + /home/tacyas/Eos/include/Array.h /home/tacyas/Eos/include/ctfInfo.h ++>>>>>>> refs/remotes/origin/master usage.o: usage.c /usr/include/stdc-predef.h /usr/include/stdio.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ diff --cc src/Tools/mrcImage/mrcImageDivergence/src/X86LINUX64/.Depend index ff967edd7f,3c7abbed0d..d9252d6771 --- a/src/Tools/mrcImage/mrcImageDivergence/src/X86LINUX64/.Depend +++ b/src/Tools/mrcImage/mrcImageDivergence/src/X86LINUX64/.Depend @@@ -20,7 -20,7 +20,11 @@@ argCheck.o: argCheck.c /usr/include/std /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ /usr/include/bits/mathcalls.h ../inc/config.h \ ++<<<<<<< HEAD + ../inc/../inc/mrcImageDivergence.h /home/enokida/Eos/include/genUtil.h \ ++======= + ../inc/../inc/mrcImageDivergence.h /home/tacyas/Eos/include/genUtil.h \ ++>>>>>>> refs/remotes/origin/master /usr/include/values.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/limits.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/syslimits.h \ @@@ -28,8 -28,8 +32,13 @@@ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/float.h \ ++<<<<<<< HEAD + /home/enokida/Eos/include/eosString.h /home/enokida/Eos/include/File.h \ + /home/enokida/Eos/include/Memory.h ++======= + /home/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \ + /home/tacyas/Eos/include/Memory.h ++>>>>>>> refs/remotes/origin/master init.o: init.c /usr/include/stdc-predef.h /usr/include/stdio.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ @@@ -52,7 -52,7 +61,11 @@@ /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ /usr/include/bits/mathcalls.h ../inc/config.h \ ++<<<<<<< HEAD + ../inc/../inc/mrcImageDivergence.h /home/enokida/Eos/include/genUtil.h \ ++======= + ../inc/../inc/mrcImageDivergence.h /home/tacyas/Eos/include/genUtil.h \ ++>>>>>>> refs/remotes/origin/master /usr/include/values.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/limits.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/syslimits.h \ @@@ -60,8 -60,8 +73,13 @@@ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/float.h \ ++<<<<<<< HEAD + /home/enokida/Eos/include/eosString.h /home/enokida/Eos/include/File.h \ + /home/enokida/Eos/include/Memory.h ++======= + /home/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \ + /home/tacyas/Eos/include/Memory.h ++>>>>>>> refs/remotes/origin/master mrcImageDivergence.o: mrcImageDivergence.c /usr/include/stdc-predef.h \ /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ @@@ -84,7 -84,7 +102,11 @@@ /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ /usr/include/bits/mathcalls.h ../inc/config.h \ ++<<<<<<< HEAD + ../inc/../inc/mrcImageDivergence.h /home/enokida/Eos/include/genUtil.h \ ++======= + ../inc/../inc/mrcImageDivergence.h /home/tacyas/Eos/include/genUtil.h \ ++>>>>>>> refs/remotes/origin/master /usr/include/values.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/limits.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/syslimits.h \ @@@ -92,9 -92,9 +114,15 @@@ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/float.h \ ++<<<<<<< HEAD + /home/enokida/Eos/include/mrcImage.h /home/enokida/Eos/include/genUtil.h \ + /home/enokida/Eos/include/Matrix3D.h /home/enokida/Eos/include/Vector.h \ + /home/enokida/Eos/include/Array.h /home/enokida/Eos/include/ctfInfo.h ++======= + /home/tacyas/Eos/include/mrcImage.h /home/tacyas/Eos/include/genUtil.h \ + /home/tacyas/Eos/include/Matrix3D.h /home/tacyas/Eos/include/Vector.h \ + /home/tacyas/Eos/include/Array.h /home/tacyas/Eos/include/ctfInfo.h ++>>>>>>> refs/remotes/origin/master usage.o: usage.c /usr/include/stdc-predef.h /usr/include/stdio.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ diff --cc src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/.Depend index 872e96b519,42554642f0..f1b5f4c25b --- a/src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/.Depend +++ b/src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/.Depend @@@ -20,7 -20,7 +20,11 @@@ argCheck.o: argCheck.c /usr/include/std /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ /usr/include/bits/mathcalls.h ../inc/config.h \ ++<<<<<<< HEAD + ../inc/../inc/mrcImageOpticalFlow.h /home/enokida/Eos/include/genUtil.h \ ++======= + ../inc/../inc/mrcImageOpticalFlow.h /home/tacyas/Eos/include/genUtil.h \ ++>>>>>>> refs/remotes/origin/master /usr/include/values.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/limits.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/syslimits.h \ @@@ -28,8 -28,8 +32,13 @@@ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/float.h \ ++<<<<<<< HEAD + /home/enokida/Eos/include/eosString.h /home/enokida/Eos/include/File.h \ + /home/enokida/Eos/include/Memory.h ++======= + /home/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \ + /home/tacyas/Eos/include/Memory.h ++>>>>>>> refs/remotes/origin/master init.o: init.c /usr/include/stdc-predef.h /usr/include/stdio.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ @@@ -52,7 -52,7 +61,11 @@@ /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ /usr/include/bits/mathcalls.h ../inc/config.h \ ++<<<<<<< HEAD + ../inc/../inc/mrcImageOpticalFlow.h /home/enokida/Eos/include/genUtil.h \ ++======= + ../inc/../inc/mrcImageOpticalFlow.h /home/tacyas/Eos/include/genUtil.h \ ++>>>>>>> refs/remotes/origin/master /usr/include/values.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/limits.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/syslimits.h \ @@@ -60,8 -60,8 +73,13 @@@ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/float.h \ ++<<<<<<< HEAD + /home/enokida/Eos/include/eosString.h /home/enokida/Eos/include/File.h \ + /home/enokida/Eos/include/Memory.h ++======= + /home/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \ + /home/tacyas/Eos/include/Memory.h ++>>>>>>> refs/remotes/origin/master mrcImageOpticalFlow.o: mrcImageOpticalFlow.c /usr/include/stdc-predef.h \ /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ @@@ -133,10 -133,10 +151,17 @@@ /usr/include/gsl/gsl_vector.h /usr/include/gsl/gsl_blas.h \ /usr/include/gsl/gsl_blas_types.h /usr/include/gsl/gsl_cblas.h \ ../inc/config.h ../inc/../inc/mrcImageOpticalFlow.h \ ++<<<<<<< HEAD + /home/enokida/Eos/include/genUtil.h /usr/include/values.h \ + /home/enokida/Eos/include/mrcImage.h /home/enokida/Eos/include/genUtil.h \ + /home/enokida/Eos/include/Matrix3D.h /home/enokida/Eos/include/Vector.h \ + /home/enokida/Eos/include/Array.h /home/enokida/Eos/include/ctfInfo.h \ ++======= + /home/tacyas/Eos/include/genUtil.h /usr/include/values.h \ + /home/tacyas/Eos/include/mrcImage.h /home/tacyas/Eos/include/genUtil.h \ + /home/tacyas/Eos/include/Matrix3D.h /home/tacyas/Eos/include/Vector.h \ + /home/tacyas/Eos/include/Array.h /home/tacyas/Eos/include/ctfInfo.h \ ++>>>>>>> refs/remotes/origin/master ../inc/mrcImageOpticalFlow.h usage.o: usage.c /usr/include/stdc-predef.h /usr/include/stdio.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ diff --cc src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/X86LINUX64/.Depend index 139f8bec9d,2d0aac8ed6..6f3b93342d --- a/src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/X86LINUX64/.Depend +++ b/src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/X86LINUX64/.Depend @@@ -21,15 -21,15 +21,24 @@@ argCheck.o: argCheck.c /usr/include/std /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ /usr/include/bits/mathcalls.h ../inc/config.h \ ../inc/../inc/mrcImageSuperResolutionByOpticalFlow.h \ ++<<<<<<< HEAD + /home/enokida/Eos/include/genUtil.h /usr/include/values.h \ ++======= + /home/tacyas/Eos/include/genUtil.h /usr/include/values.h \ ++>>>>>>> refs/remotes/origin/master /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/limits.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/syslimits.h \ /usr/include/limits.h /usr/include/bits/posix1_lim.h \ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/float.h \ ++<<<<<<< HEAD + /home/enokida/Eos/include/eosString.h /home/enokida/Eos/include/File.h \ + /home/enokida/Eos/include/Memory.h ++======= + /home/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \ + /home/tacyas/Eos/include/Memory.h ++>>>>>>> refs/remotes/origin/master init.o: init.c /usr/include/stdc-predef.h /usr/include/stdio.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ @@@ -53,15 -53,15 +62,24 @@@ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ /usr/include/bits/mathcalls.h ../inc/config.h \ ../inc/../inc/mrcImageSuperResolutionByOpticalFlow.h \ ++<<<<<<< HEAD + /home/enokida/Eos/include/genUtil.h /usr/include/values.h \ ++======= + /home/tacyas/Eos/include/genUtil.h /usr/include/values.h \ ++>>>>>>> refs/remotes/origin/master /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/limits.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/syslimits.h \ /usr/include/limits.h /usr/include/bits/posix1_lim.h \ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/float.h \ ++<<<<<<< HEAD + /home/enokida/Eos/include/eosString.h /home/enokida/Eos/include/File.h \ + /home/enokida/Eos/include/Memory.h ++======= + /home/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \ + /home/tacyas/Eos/include/Memory.h ++>>>>>>> refs/remotes/origin/master mrcImageSuperResolutionByOpticalFlow.o: \ mrcImageSuperResolutionByOpticalFlow.c /usr/include/stdc-predef.h \ /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ @@@ -86,17 -86,17 +104,28 @@@ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ /usr/include/bits/mathcalls.h ../inc/config.h \ ../inc/../inc/mrcImageSuperResolutionByOpticalFlow.h \ ++<<<<<<< HEAD + /home/enokida/Eos/include/genUtil.h /usr/include/values.h \ ++======= + /home/tacyas/Eos/include/genUtil.h /usr/include/values.h \ ++>>>>>>> refs/remotes/origin/master /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/limits.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/syslimits.h \ /usr/include/limits.h /usr/include/bits/posix1_lim.h \ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h \ /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/float.h \ ++<<<<<<< HEAD + /home/enokida/Eos/include/Memory.h /home/enokida/Eos/include/mrcImage.h \ + /home/enokida/Eos/include/genUtil.h /home/enokida/Eos/include/Matrix3D.h \ + /home/enokida/Eos/include/Vector.h /home/enokida/Eos/include/Array.h \ + /home/enokida/Eos/include/ctfInfo.h ++======= + /home/tacyas/Eos/include/Memory.h /home/tacyas/Eos/include/mrcImage.h \ + /home/tacyas/Eos/include/genUtil.h /home/tacyas/Eos/include/Matrix3D.h \ + /home/tacyas/Eos/include/Vector.h /home/tacyas/Eos/include/Array.h \ + /home/tacyas/Eos/include/ctfInfo.h ++>>>>>>> refs/remotes/origin/master usage.o: usage.c /usr/include/stdc-predef.h /usr/include/stdio.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \