bin/wish/Display2/tclIndex

	bin/wish/Display2/tclIndex
	src/Tools/Config/Define.inc
	src/Tools/Integration/Display2/src/Display2.html
	src/Tools/Integration/ctfDisplay/src/ctfDisplay.html
	src/Tools/Integration/imagesView/src/imagesView.html
	src/Tools/ctfInfo/ctfDeterminationByBayes/src/ctfDeterminationByBayes.html
	src/Tools/eosPoint/eosPointProjector/src/eosPointProjector.html
	src/Tools/filter/tiff2mrc/src/tiff2mrc.html
	src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html
g
g It looks like you may be committing a merge.
g If this is not correct, please remove the file
g	.git/MERGE_HEAD
g and try again.

g Please enter the commit message for your changes. Lines starting
g with '#' will be ignored, and an empty message aborts the commit.
g On branch master
g Your branch and 'origin/master' have diverged,
g and have 3 and 4 different commits each, respectively.
g   (use "git pull" to merge the remote branch into yours)
g
g All conflicts fixed but you are still merging.
g
g Changes to be committed:
g	new file:   bin/eosPointCurvatureInfo
g	new file:   bin/mrc2ascii
g	new file:   bin/mrcImageMergeFFT
g	modified:   bin/wish/Display2/tclIndex
g	modified:   include/Matrix3D.h
g	modified:   include/eosBayes.h
g	modified:   include/genUtil.h
g	modified:   include/lmrcFFTCentralSection.h
g	modified:   include/mrcImage.h
g	modified:   lib/tclIndex
g	modified:   src/Objects/DataExpress/TclTk/src/ctfInfo.wish
g	modified:   src/Objects/DataManip/mrcImage/doc/mrcImage.html
g	modified:   src/Objects/DataManip/mrcImage/inc/mrcImage.h
g	modified:   src/Objects/DataManip/mrcImage/src/lmrcFFTCentralSection.h
g	modified:   src/Objects/DataManip/mrcImage/src/lmrcImage3DPad.c
g	modified:   src/Objects/DataManip/mrcImage/src/lmrcImagePattersonFunctionCalc.c
g	modified:   src/Objects/DataManip/mrcImage/src/lmrcImageSmoothing.c
g	modified:   src/Objects/DataManip/mrcImage/src/mrcImageGet.c
g	modified:   src/Objects/General/Matrix3D/inc/Matrix3D.h
g	modified:   src/Objects/General/eosBayes/doc/eosBayes.html
g	modified:   src/Objects/General/genUtil/inc/genUtil.h
g	modified:   src/Tools/.Source
g	modified:   src/Tools/.Source.org
g	modified:   src/Tools/Config/Define.inc
g	modified:   src/Tools/Integration/Display2/src/Display2.html
g	modified:   src/Tools/Integration/ctfDisplay/src/ctfDisplay.html
g	modified:   src/Tools/Integration/imagesView/src/imagesView.html
g	modified:   src/Tools/ctfInfo/ctfDeterminationByBayes/src/ctfDeterminationByBayes.html
g	modified:   src/Tools/ctfInfo/ctfDeterminationFromThonRing/src/argCheck.c
g	modified:   src/Tools/ctfInfo/defocusDeterminationFromThonRing/src/argCheck.c
g	modified:   src/Tools/eosPoint/.Source.org
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/Config/Define.inc
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/Config/OptionControlFile
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/Config/Target.inc
g	renamed:    src/Tools/eosPoint/eosPointTracker/Makefile -> src/Tools/eosPoint/eosPointCurvatureInfo/Makefile
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/doc/Makefile
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/inc/config.h
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/inc/eosPointCurvatureInfo.h
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/.Depend
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/.Source
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/Makefile
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/X86MAC64
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/argCheck.c
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.c
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.html
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.pane
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/init.c
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/usage.c
g	new file:   src/Tools/eosPoint/eosPointCurvatureInfo/src/util.c
g	modified:   src/Tools/eosPoint/eosPointProjector/src/eosPointProjector.html
g	modified:   src/Tools/filter/.Source
g	new file:   src/Tools/filter/mrc2ascii/Config/Define.inc
g	new file:   src/Tools/filter/mrc2ascii/Config/OptionControlFile
g	new file:   src/Tools/filter/mrc2ascii/Config/Target.inc
g	new file:   src/Tools/filter/mrc2ascii/Makefile
g	new file:   src/Tools/filter/mrc2ascii/doc/Makefile
g	new file:   src/Tools/filter/mrc2ascii/inc/config.h
g	new file:   src/Tools/filter/mrc2ascii/inc/mrc2ascii.h
g	new file:   src/Tools/filter/mrc2ascii/src/.Depend
g	new file:   src/Tools/filter/mrc2ascii/src/.Source
g	new file:   src/Tools/filter/mrc2ascii/src/Makefile
g	new file:   src/Tools/filter/mrc2ascii/src/X86MAC64
g	new file:   src/Tools/filter/mrc2ascii/src/argCheck.c
g	new file:   src/Tools/filter/mrc2ascii/src/init.c
g	new file:   src/Tools/filter/mrc2ascii/src/mrc2ascii.c
g	new file:   src/Tools/filter/mrc2ascii/src/mrc2ascii.html
g	new file:   src/Tools/filter/mrc2ascii/src/mrc2ascii.pane
g	new file:   src/Tools/filter/mrc2ascii/src/usage.c
g	new file:   src/Tools/filter/mrc2ascii/src/util.c
g	modified:   src/Tools/filter/tiff2mrc/src/tiff2mrc.html
g	modified:   src/Tools/mrcImage/.Source
g	modified:   src/Tools/mrcImage/.Source.org
g	modified:   src/Tools/mrcImage/mrcImage3DPad/src/mrcImage3DPad.c
g	modified:   src/Tools/mrcImage/mrcImageAutoFilamentExtract/src/argCheck.c
g	modified:   src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/Config/Define.inc
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/Config/OptionControlFile
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/Config/Target.inc
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/Makefile
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/doc/Makefile
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/inc/config.h
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/inc/mrcImageMergeFFT.h
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/.Depend
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/.Source
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/Makefile
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/X86MAC64
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/argCheck.c
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/init.c
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.c
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.html
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.pane
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/usage.c
g	new file:   src/Tools/mrcImage/mrcImageMergeFFT/src/util.c
g	modified:   src/Tools/mrcImage/mrcImageModeChange/Config/OptionControlFile
g	modified:   src/Tools/mrcImage/mrcImageModeChange/inc/mrcImageModeChange.h
g	modified:   src/Tools/mrcImage/mrcImageModeChange/src/argCheck.c
g	modified:   src/Tools/mrcImage/mrcImageModeChange/src/init.c
g	modified:   src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.c
g	modified:   src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.html
g	modified:   src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.pane
g	modified:   src/Tools/mrcImage/mrcImageModeChange/src/usage.c
g	modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/Config/OptionControlFile
g	modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/inc/mrcImagePattersonFunctionCalc.h
g	modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/argCheck.c
g	modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/init.c
g	modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/mrcImagePattersonFunctionCalc.c
g	modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/mrcImagePattersonFunctionCalc.html
g	modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/mrcImagePattersonFunctionCalc.pane
g	modified:   src/Tools/mrcImage/mrcImagePattersonFunctionCalc/src/usage.c
g	copied:     src/Tools/mrcImage/mrcImageUnbentROI/src/argCheck.c -> src/Tools/mrcImage/mrcImagePrint/src/argCheck.c
g	modified:   src/Tools/mrcImage/mrcImagePrint3D/src/argCheck.c
g	modified:   src/Tools/mrcImage/mrcImageShapePCA/src/argCheck.c
g	modified:   src/Tools/mrcImage/mrcImageShapePCAFit/src/argCheck.c
g	modified:   src/Tools/mrcImage/mrcImageSmoothing/Config/OptionControlFile
g	modified:   src/Tools/mrcImage/mrcImageSmoothing/inc/mrcImageSmoothing.h
g	modified:   src/Tools/mrcImage/mrcImageSmoothing/src/argCheck.c
g	modified:   src/Tools/mrcImage/mrcImageSmoothing/src/init.c
g	modified:   src/Tools/mrcImage/mrcImageSmoothing/src/mrcImageSmoothing.c
g	modified:   src/Tools/mrcImage/mrcImageSmoothing/src/mrcImageSmoothing.html
g	modified:   src/Tools/mrcImage/mrcImageSmoothing/src/mrcImageSmoothing.pane
g	modified:   src/Tools/mrcImage/mrcImageSmoothing/src/usage.c
g	modified:   src/Tools/mrcImage/mrcImageUnbentROI/src/argCheck.c
g	modified:   src/Tools/pdbUtil/pdbRhoFit/src/argCheck.c
g	modified:   src/Tools/pdbUtil/pdbRhoFitTm/src/argCheck.c
g	modified:   src/Tools/rec3d/llExtract/src/argCheck.c
g	modified:   src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/mrcImageSeriesInfoPerPixel.html
g