Merge branch 'master' of git.osdn.jp:/gitroot/eos/base

 Conflicts:
	.DS_Store
	bin/wish/Display2/tclIndex
	src/Tools/Config/Define.inc

 It looks like you may be committing a merge.
 If this is not correct, please run
	git update-ref -d 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.

 On branch master
 Your branch and 'origin/master' have diverged,
 and have 1 and 11 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:
	deleted:    .DS_Store
	new file:   bin/crystalGetLatticeVolume
	new file:   bin/crystalGetReciprocalLattice
	new file:   bin/eosMathAverage
	new file:   bin/eosMathMedian
	new file:   bin/eosMathSorting
	new file:   bin/mrcImageBackgroundSubtraction
	new file:   bin/mrcImageCrystalDeform
	modified:   bin/wish/Display2/tclIndex
	modified:   include/eosMATH.h
	new file:   include/eosMath.h
	modified:   src/Objects/DataExpress/Contour/doc/Contour.html
	modified:   src/Objects/DataExpress/TclTk/doc/TclTk.html
	modified:   src/Objects/DataExpress/avsFile/doc/avsFile.html
	modified:   src/Objects/DataExpress/eosOpenGL/doc/eosOpenGL.html
	modified:   src/Objects/DataExpress/gifFile/doc/gifFile.html
	modified:   src/Objects/DataExpress/pngFile/doc/pngFile.html
	modified:   src/Objects/DataExpress/psFile/doc/psFile.html
	modified:   src/Objects/DataManip/bildFile/doc/bildFile.html
	modified:   src/Objects/DataManip/bmpFile/doc/bmpFile.html
	modified:   src/Objects/DataManip/ctfInfo/doc/ctfInfo.html
	modified:   src/Objects/DataManip/dmFile/doc/dmFile.html
	modified:   src/Objects/DataManip/dsn6File/doc/dsn6File.html
	modified:   src/Objects/DataManip/emData/doc/emData.html
	modified:   src/Objects/DataManip/khorosData/doc/khorosData.html
	modified:   src/Objects/DataManip/largeIP/doc/largeIP.html
	modified:   src/Objects/DataManip/llData/doc/llData.html
	modified:   src/Objects/DataManip/ltlgData/doc/ltlgData.html
	modified:   src/Objects/DataManip/mapFile/doc/mapFile.html
	modified:   src/Objects/DataManip/mrcImage/doc/mrcImage.html
	modified:   src/Objects/DataManip/mrcImage/src/lmrcFFTExpression.c
	modified:   src/Objects/DataManip/mrcImageShape/doc/mrcImageShape.html
	modified:   src/Objects/DataManip/pdbFile/doc/pdbFile.html
	modified:   src/Objects/DataManip/rigakuImage/doc/rigakuImage.html
	modified:   src/Objects/DataManip/tgaFile/doc/tgaFile.html
	modified:   src/Objects/DataManip/transform/doc/transform.html
	modified:   src/Objects/General/.Source
	modified:   src/Objects/General/.Source.org
	modified:   src/Objects/General/Cluster/doc/Cluster.html
	modified:   src/Objects/General/Crystal/doc/Crystal.html
	modified:   src/Objects/General/Map2D/doc/Map2D.html
	modified:   src/Objects/General/Matrix3D/doc/Matrix3D.html
	modified:   src/Objects/General/Memory/doc/Memory.html
	modified:   src/Objects/General/PVM/doc/PVM.html
	modified:   src/Objects/General/Random/doc/Random.html
	modified:   src/Objects/General/Socket/doc/Socket.html
	modified:   src/Objects/General/SpecialNumber/doc/SpecialNumber.html
	modified:   src/Objects/General/Vector/doc/Vector.html
	modified:   src/Objects/General/eosBayes/doc/eosBayes.html
	modified:   src/Objects/General/eosFunc/doc/eosFunc.html
	new file:   src/Objects/General/eosMath/.Source
	new file:   src/Objects/General/eosMath/.Source.org
	new file:   src/Objects/General/eosMath/Config/Define.inc
	new file:   src/Objects/General/eosMath/Config/Target.inc
	new file:   src/Objects/General/eosMath/Makefile
	new file:   src/Objects/General/eosMath/doc/.eosMath.html
	new file:   src/Objects/General/eosMath/doc/.footer
	new file:   src/Objects/General/eosMath/doc/.header
	new file:   src/Objects/General/eosMath/doc/Makefile
	new file:   src/Objects/General/eosMath/doc/eosMath.html
	new file:   src/Objects/General/eosMath/inc/Makefile
	new file:   src/Objects/General/eosMath/inc/eosMath.h
	new file:   src/Objects/General/eosMath/inc/eosMath.h.org
	new file:   src/Objects/General/eosMath/src/.CCHeader
	new file:   src/Objects/General/eosMath/src/.CHeader
	new file:   src/Objects/General/eosMath/src/.Ruby
	new file:   src/Objects/General/eosMath/src/.Wish
	new file:   src/Objects/General/eosMath/src/Makefile
	new file:   src/Objects/General/eosMath/src/X86LINUX64
	new file:   src/Objects/General/eosMath/src/X86MAC64
	new file:   src/Objects/General/eosMath/src/eosMathStatistics.c
	modified:   src/Objects/General/eosPThread/doc/eosPThread.html
	modified:   src/Objects/General/eosPoint/doc/eosPoint.html
	modified:   src/Tools/.Source
	modified:   src/Tools/Config/Define.inc
	modified:   src/Tools/DCDFile/dcdCompareCA/src/dcdCompareCA.html
	modified:   src/Tools/DCDFile/dcdDistanceAtomBetweenAtom/src/dcdDistanceAtomBetweenAtom.html
	modified:   src/Tools/Integration/Display3/src/Display3.html
	modified:   src/Tools/Integration/Eos/src/Eos.html
	modified:   src/Tools/Integration/StereoDisplay/src/StereoDisplay.html
	modified:   src/Tools/Integration/Visualmake/src/Visualmake.html
	modified:   src/Tools/Integration/ctfDisplay/src/ctfDisplay.html
	modified:   src/Tools/Integration/imagesClustering/src/imagesClustering.html
	modified:   src/Tools/Integration/imagesView/src/imagesView.html
	modified:   src/Tools/Integration/obj3Don2DImageView/src/obj3Don2DImageView.html
	modified:   src/Tools/Integration/smolet/src/smolet.html
	modified:   src/Tools/crystal/.Source.org
	new file:   src/Tools/crystal/Config/Target.inc
	new file:   src/Tools/crystal/crystalGetLatticeVolume/src/X86LINUX64
	new file:   src/Tools/crystal/crystalGetLatticeVolume/src/crystalGetLatticeVolume.html
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/src/X86LINUX64
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/src/crystalGetReciprocalLattice.html
	modified:   src/Tools/ctfInfo/ctfDeterminationByBayes/src/ctfDeterminationByBayes.html
	modified:   src/Tools/ctfInfo/ctfDeterminationFromPhaseComparison/src/ctfDeterminationFromPhaseComparison.html
	modified:   src/Tools/ctfInfo/ctfDeterminationFromThonRing/src/ctfDeterminationFromThonRing.html
	modified:   src/Tools/ctfInfo/ctfFunctionServer/src/ctfFunctionServer.html
	modified:   src/Tools/ctfInfo/ctfMultiFunction/src/ctfMultiFunction.html
	modified:   src/Tools/ctfInfo/ctfZeroPoint/src/ctfZeroPoint.html
	modified:   src/Tools/ctfInfo/defocusDeterminationFromThonRing/src/defocusDeterminationFromThonRing.html
	modified:   src/Tools/ctfInfo/tiltInfoDetermine/src/tiltInfoDetermine.html
	modified:   src/Tools/database/homology2PG/src/homology2PG.html
	modified:   src/Tools/database/pgDataBaseSelectServer/src/pgDataBaseSelectServer.html
	modified:   src/Tools/database/pgJournalSelect/src/pgJournalSelect.html
	modified:   src/Tools/database/pgJournalSelectCORBAClient/src/pgJournalSelectCORBAClient.html
	modified:   src/Tools/database/pgJournalSelectCORBAServer/src/pgJournalSelectCORBAServer.html
	modified:   src/Tools/database/pgMemoSelectCORBAServer/src/pgMemoSelectCORBAServer.html
	modified:   src/Tools/database/pgSelect/src/pgSelect.html
	modified:   src/Tools/eosBayes/eosBayesInit/src/eosBayesInit.html
	new file:   src/Tools/eosMath/.Source.org
	new file:   src/Tools/eosMath/Config/Define.inc
	new file:   src/Tools/eosMath/Config/Target.inc
	new file:   src/Tools/eosMath/Makefile
	new file:   src/Tools/eosMath/eosMathAverage/Config/Define.inc
	new file:   src/Tools/eosMath/eosMathAverage/Config/OptionControlFile
	new file:   src/Tools/eosMath/eosMathAverage/Config/Target.inc
	new file:   src/Tools/eosMath/eosMathAverage/Makefile
	new file:   src/Tools/eosMath/eosMathAverage/doc/Makefile
	new file:   src/Tools/eosMath/eosMathAverage/inc/config.h
	new file:   src/Tools/eosMath/eosMathAverage/inc/eosMathAverage.h
	new file:   src/Tools/eosMath/eosMathAverage/src/.Depend
	new file:   src/Tools/eosMath/eosMathAverage/src/.Source
	new file:   src/Tools/eosMath/eosMathAverage/src/Makefile
	new file:   src/Tools/eosMath/eosMathAverage/src/X86LINUX64
	new file:   src/Tools/eosMath/eosMathAverage/src/X86MAC64
	new file:   src/Tools/eosMath/eosMathAverage/src/argCheck.c
	new file:   src/Tools/eosMath/eosMathAverage/src/eosMathAverage.c
	new file:   src/Tools/eosMath/eosMathAverage/src/eosMathAverage.html
	new file:   src/Tools/eosMath/eosMathAverage/src/eosMathAverage.pane
	new file:   src/Tools/eosMath/eosMathAverage/src/init.c
	new file:   src/Tools/eosMath/eosMathAverage/src/test/Makefile
	new file:   src/Tools/eosMath/eosMathAverage/src/test/data
	new file:   src/Tools/eosMath/eosMathAverage/src/usage.c
	new file:   src/Tools/eosMath/eosMathAverage/src/util.c
	new file:   src/Tools/eosMath/eosMathMedian/Config/Define.inc
	new file:   src/Tools/eosMath/eosMathMedian/Config/OptionControlFile
	new file:   src/Tools/eosMath/eosMathMedian/Config/Target.inc
	new file:   src/Tools/eosMath/eosMathMedian/Makefile
	new file:   src/Tools/eosMath/eosMathMedian/doc/Makefile
	new file:   src/Tools/eosMath/eosMathMedian/inc/config.h
	new file:   src/Tools/eosMath/eosMathMedian/inc/eosMathMedian.h
	new file:   src/Tools/eosMath/eosMathMedian/src/.Depend
	new file:   src/Tools/eosMath/eosMathMedian/src/.Source
	new file:   src/Tools/eosMath/eosMathMedian/src/Makefile
	new file:   src/Tools/eosMath/eosMathMedian/src/X86LINUX64
	new file:   src/Tools/eosMath/eosMathMedian/src/X86MAC64
	new file:   src/Tools/eosMath/eosMathMedian/src/argCheck.c
	new file:   src/Tools/eosMath/eosMathMedian/src/eosMathMedian.c
	new file:   src/Tools/eosMath/eosMathMedian/src/eosMathMedian.html
	new file:   src/Tools/eosMath/eosMathMedian/src/eosMathMedian.pane
	new file:   src/Tools/eosMath/eosMathMedian/src/init.c
	new file:   src/Tools/eosMath/eosMathMedian/src/test/Makefile
	new file:   src/Tools/eosMath/eosMathMedian/src/test/data
	new file:   src/Tools/eosMath/eosMathMedian/src/usage.c
	new file:   src/Tools/eosMath/eosMathMedian/src/util.c
	new file:   src/Tools/eosMath/eosMathSorting/Config/Define.inc
	new file:   src/Tools/eosMath/eosMathSorting/Config/OptionControlFile
	new file:   src/Tools/eosMath/eosMathSorting/Config/Target.inc
	new file:   src/Tools/eosMath/eosMathSorting/Makefile
	new file:   src/Tools/eosMath/eosMathSorting/doc/Makefile
	new file:   src/Tools/eosMath/eosMathSorting/inc/config.h
	new file:   src/Tools/eosMath/eosMathSorting/inc/eosMathSorting.h
	new file:   src/Tools/eosMath/eosMathSorting/src/.Depend
	new file:   src/Tools/eosMath/eosMathSorting/src/.Source
	new file:   src/Tools/eosMath/eosMathSorting/src/Makefile
	new file:   src/Tools/eosMath/eosMathSorting/src/X86LINUX64
	new file:   src/Tools/eosMath/eosMathSorting/src/X86MAC64
	new file:   src/Tools/eosMath/eosMathSorting/src/argCheck.c
	new file:   src/Tools/eosMath/eosMathSorting/src/eosMathSorting.c
	new file:   src/Tools/eosMath/eosMathSorting/src/eosMathSorting.html
	new file:   src/Tools/eosMath/eosMathSorting/src/eosMathSorting.pane
	new file:   src/Tools/eosMath/eosMathSorting/src/init.c
	new file:   src/Tools/eosMath/eosMathSorting/src/test/Makefile
	new file:   src/Tools/eosMath/eosMathSorting/src/test/data
	new file:   src/Tools/eosMath/eosMathSorting/src/usage.c
	new file:   src/Tools/eosMath/eosMathSorting/src/util.c
	modified:   src/Tools/eosPoint/eosPointCurvatureInfo/src/eosPointCurvatureInfo.html
	modified:   src/Tools/eosPoint/eosPointProjector/src/eosPointProjector.html
	modified:   src/Tools/eosPoint/eosPointRotation/src/eosPointRotation.html
	modified:   src/Tools/filter/moi2mrc/src/moi2mrc.html
	modified:   src/Tools/filter/mrc2gif/src/mrc2gif.html
	modified:   src/Tools/filter/mrc2lattice/src/mrc2lattice.html
	modified:   src/Tools/filter/mrc2pov/src/mrc2pov.html
	modified:   src/Tools/filter/mrc2viff/src/mrc2viff.html
	modified:   src/Tools/hf2000/hf2000Init/src/hf2000Init.html
	modified:   src/Tools/hf2000/hf2000LenzCurrent/src/hf2000LenzCurrent.html
	modified:   src/Tools/hf2000/hf2000SpecimenPosition/src/hf2000SpecimenPosition.html
	modified:   src/Tools/khorosTool/khorosFilterGenerate/src/khorosFilterGenerate.html
	modified:   src/Tools/llData/llDataAxisSearch/src/llDataAxisSearch.html
	modified:   src/Tools/llData/llDataCTFCompensate/src/llDataCTFCompensate.html
	modified:   src/Tools/llData/llDataFitServer/src/llDataFitServer.html
	modified:   src/Tools/llData/llDataMultiCTFCompensation/src/llDataMultiCTFCompensation.html
	modified:   src/Tools/llData/llDataPrint/src/llDataPrint.html
	modified:   src/Tools/llData/llDataRotation/src/llDataRotation.html
	modified:   src/Tools/llData/llDataSeparate/src/llDataSeparate.html
	modified:   src/Tools/matrix3D/matrix3DEulerAngleTransform/src/matrix3DEulerAngleTransform.html
	modified:   src/Tools/matrix3D/matrix3DFromEulerAngle/src/matrix3DFromEulerAngle.html
	modified:   src/Tools/matrix3D/matrix3DInverse/src/matrix3DInverse.html
	modified:   src/Tools/mrcImage/.Source
	modified:   src/Tools/mrcImage/.Source.org
	modified:   src/Tools/mrcImage/fft2d/src/fft2d.html
	modified:   src/Tools/mrcImage/mrc2dsn6/src/mrc2dsn6.html
	modified:   src/Tools/mrcImage/mrc2hdf/src/mrc2hdf.html
	modified:   src/Tools/mrcImage/mrcFFTCTFCompensation/src/mrcFFTCTFCompensation.html
	modified:   src/Tools/mrcImage/mrcFFTCentralSection/src/mrcFFTCentralSection.html
	modified:   src/Tools/mrcImage/mrcFFTCentralSectionCompare/src/mrcFFTCentralSectionCompare.html
	modified:   src/Tools/mrcImage/mrcFFTIQEstimation/src/mrcFFTIQEstimation.html
	modified:   src/Tools/mrcImage/mrcImage1dCutAverage/src/mrcImage1dCutAverage.html
	modified:   src/Tools/mrcImage/mrcImage3DCTFObservation/src/mrcImage3DCTFObservation.html
	modified:   src/Tools/mrcImage/mrcImage3DPeakGet/src/mrcImage3DPeakGet.html
	modified:   src/Tools/mrcImage/mrcImageAutoFilamentExtract/src/mrcImageAutoFilamentExtract.html
	modified:   src/Tools/mrcImage/mrcImageAutoRotationCorrelationResultPrint/src/mrcImageAutoRotationCorrelationResultPrint.html
	modified:   src/Tools/mrcImage/mrcImageAutoTriming/src/mrcImageAutoTriming.html
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/Config/Define.inc
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/Config/OptionControlFile
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/Config/Target.inc
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/Makefile
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/doc/Makefile
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/inc/config.h
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/inc/mrcImageBackgroundSubtraction.h
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/.Depend
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/.Source
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/ALPHA
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/ALPHALINUX
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/ALPHALINUX5
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/ALPHAOSF1
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/CELLLINUX64
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/HP
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/I386LINUX
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/I686LINUX
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/Makefile
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/SGI
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/SPARC
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/X86LINUX64
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/X86MAC64
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/argCheck.c
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/init.c
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/mrcImageBackgroundSubtraction.c
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/mrcImageBackgroundSubtraction.html
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/mrcImageBackgroundSubtraction.pane
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/test/Makefile
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/test/data
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/usage.c
	new file:   src/Tools/mrcImage/mrcImageBackgroundSubtraction/src/util.c
	modified:   src/Tools/mrcImage/mrcImageBilateralFilter/src/mrcImageBilateralFilter.html
	modified:   src/Tools/mrcImage/mrcImageCTFCompensation/src/mrcImageCTFCompensation.html
	modified:   src/Tools/mrcImage/mrcImageCTFCompensationForTiltImage/src/mrcImageCTFCompensationForTiltImage.html
	modified:   src/Tools/mrcImage/mrcImageChainCodeCalc/src/mrcImageChainCodeCalc.html
	modified:   src/Tools/mrcImage/mrcImageColoring/src/mrcImageColoring.html
	modified:   src/Tools/mrcImage/mrcImageConvolution/src/mrcImageConvolution.html
	modified:   src/Tools/mrcImage/mrcImageCoreImageCalc/src/mrcImageCoreImageCalc.html
	modified:   src/Tools/mrcImage/mrcImageCorrelationServer/src/mrcImageCorrelationServer.html
	modified:   src/Tools/mrcImage/mrcImageCorrelationWithCTFCompensation/src/mrcImageCorrelationWithCTFCompensation.html
	modified:   src/Tools/mrcImage/mrcImageCrystalDeform/Config/OptionControlFile
	new file:   src/Tools/mrcImage/mrcImageCrystalDeform/src/X86LINUX64
	new file:   src/Tools/mrcImage/mrcImageCrystalDeform/src/mrcImageCrystalDeform.html
	modified:   src/Tools/mrcImage/mrcImageCutAndSetInArray/src/mrcImageCutAndSetInArray.html
	modified:   src/Tools/mrcImage/mrcImageDensityInfo/src/mrcImageDensityInfo.html
	modified:   src/Tools/mrcImage/mrcImageEdgeImageGet/src/mrcImageEdgeImageGet.html
	modified:   src/Tools/mrcImage/mrcImageEnhancementWithFuzzySets/src/mrcImageEnhancementWithFuzzySets.html
	modified:   src/Tools/mrcImage/mrcImageFFTLayerLineExtraction/src/mrcImageFFTLayerLineExtraction.html
	modified:   src/Tools/mrcImage/mrcImageFOMCalc.org/src/mrcImageFOMCalc.html
	modified:   src/Tools/mrcImage/mrcImageFOMCalc/src/mrcImageFOMCalc.html
	modified:   src/Tools/mrcImage/mrcImageFeatureCalc/src/mrcImageFeatureCalc.html
	modified:   src/Tools/mrcImage/mrcImageFilamentSearch/src/mrcImageFilamentSearch.html
	modified:   src/Tools/mrcImage/mrcImageFractalFrourierShellCorrelation/src/mrcImageFractalFrourierShellCorrelation.html
	modified:   src/Tools/mrcImage/mrcImageGaussSphere/src/mrcImageGaussSphere.html
	modified:   src/Tools/mrcImage/mrcImageHelicalConvolution/src/mrcImageHelicalConvolution.html
	modified:   src/Tools/mrcImage/mrcImageMergeFFT/src/mrcImageMergeFFT.html
	modified:   src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/mrcImageMultiCTFCompensation.html
	modified:   src/Tools/mrcImage/mrcImageMultiCTFDetermination/src/mrcImageMultiCTFDetermination.html
	modified:   src/Tools/mrcImage/mrcImageNLMeansFilter/src/mrcImageNLMeansFilter.html
	modified:   src/Tools/mrcImage/mrcImagePanoramaCreate/src/mrcImagePanoramaCreate.html
	modified:   src/Tools/mrcImage/mrcImagePeakSearch/src/mrcImagePeakSearch.html
	modified:   src/Tools/mrcImage/mrcImagePerimeterCalc/src/mrcImagePerimeterCalc.html
	modified:   src/Tools/mrcImage/mrcImagePrint/src/mrcImagePrint.html
	modified:   src/Tools/mrcImage/mrcImagePrint3D/src/mrcImagePrint3D.html
	modified:   src/Tools/mrcImage/mrcImagePut3D/src/mrcImagePut3D.html
	modified:   src/Tools/mrcImage/mrcImageROIs/src/mrcImageROIs.html
	modified:   src/Tools/mrcImage/mrcImageRadialDistribution/src/mrcImageRadialDistribution.html
	modified:   src/Tools/mrcImage/mrcImageSNEstimate/src/mrcImageSNEstimate.html
	modified:   src/Tools/mrcImage/mrcImageShapePCA/src/mrcImageShapePCA.html
	modified:   src/Tools/mrcImage/mrcImageShapePCAFit/src/mrcImageShapePCAFit.html
	modified:   src/Tools/mrcImage/mrcImageShapeRelaxation/src/mrcImageShapeRelaxation.html
	modified:   src/Tools/mrcImage/mrcImageShapeSearch/src/mrcImageShapeSearch.html
	modified:   src/Tools/mrcImage/mrcImageSimilarityEstimate/src/mrcImageSimilarityEstimate.html
	modified:   src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/mrcImageSpatialFrequencyFilter.html
	modified:   src/Tools/mrcImage/mrcImageSphereCheck/src/mrcImageSphereCheck.html
	modified:   src/Tools/mrcImage/mrcImageSuperResolution/src/mrcImageSuperResolution.html
	modified:   src/Tools/mrcImage/mrcImageSurfaceAreaCalc/src/mrcImageSurfaceAreaCalc.html
	modified:   src/Tools/mrcImage/mrcImageTiltAxisSearchHelp/src/mrcImageTiltAxisSearchHelp.html
	modified:   src/Tools/mrcImage/mrcImageUnbentROI/src/mrcImageUnbentROI.html
	modified:   src/Tools/mrcImage/mrcImageUnsharpening/src/mrcImageUnsharpening.html
	modified:   src/Tools/mrcImage/mrcImageVarianceAnalysis/src/mrcImageVarianceAnalysis.html
	modified:   src/Tools/mrcImage/mrcImageVolumeCalc/src/mrcImageVolumeCalc.html
	modified:   src/Tools/mrcImage/mrcMultiFFTCentralSectionsSigmaCalc/src/mrcMultiFFTCentralSectionsSigmaCalc.html
	modified:   src/Tools/mrcImage/mrcRefNormalizing/src/mrcRefNormalizing.html
	modified:   src/Tools/mrcImage/mrcView/src/mrcView.html
	modified:   src/Tools/openGL/molvieMrcViewer/src/molvieMrcViewer.html
	modified:   src/Tools/pdbUtil/pdbAtomSection/src/pdbAtomSection.html
	modified:   src/Tools/pdbUtil/pdbHomologySearch/src/pdbHomologySearch.html
	modified:   src/Tools/pdbUtil/pdbRhoFit/src/pdbRhoFit.html
	modified:   src/Tools/pdbUtil/pdbRhoFitTm/src/pdbRhoFitTm.html
	modified:   src/Tools/pdbUtil/pdbTempFactorSet/src/pdbTempFactorSet.html
	modified:   src/Tools/pdbUtil/pdbTrans/src/pdbTrans.html
	modified:   src/Tools/pdbUtil/pdbView/src/pdbView.html
	modified:   src/Tools/pickup/mrcImageNeuralNetParticleExtraction/src/mrcImageNeuralNetParticleExtraction.html
	modified:   src/Tools/pickup/mrcImageNeuralNetParticleLearning/src/mrcImageNeuralNetParticleLearning.html
	modified:   src/Tools/rec3d/CheckCommonLineData/src/CheckCommonLineData.html
	modified:   src/Tools/rec3d/CheckOfOrientation/src/CheckOfOrientation.html
	modified:   src/Tools/rec3d/CheckOrientationByDegree/src/CheckOrientationByDegree.html
	modified:   src/Tools/rec3d/CommonLineCalculation/src/CommonLineCalculation.html
	modified:   src/Tools/rec3d/LCalculationForOrientationSearch/src/LCalculationForOrientationSearch.html
	modified:   src/Tools/rec3d/ProjectionDirectionMapCreate/src/ProjectionDirectionMapCreate.html
	modified:   src/Tools/rec3d/WeightCalculationOfCommonLineSearch/src/WeightCalculationOfCommonLineSearch.html
	modified:   src/Tools/rec3d/WeightCalculationOfCommonLineSearchByAllSinogram/src/WeightCalculationOfCommonLineSearchByAllSinogram.html
	modified:   src/Tools/rec3d/calcCommonLine/src/calcCommonLine.html
	modified:   src/Tools/rec3d/commonLinesSearchByVoting/src/commonLinesSearchByVoting.html
	modified:   src/Tools/rec3d/ll2ltlg/src/ll2ltlg.html
	modified:   src/Tools/rec3d/llExtract/src/llExtract.html
	modified:   src/Tools/rec3d/llExtractWithLayerSeparation/src/llExtractWithLayerSeparation.html
	modified:   src/Tools/rec3d/llExtractWithLayerSeparationServer/src/llExtractWithLayerSeparationServer.html
	modified:   src/Tools/rec3d/llExtractWithLayerSeparationSingle/src/llExtractWithLayerSeparationSingle.html
	modified:   src/Tools/rec3d/ltlg2mrc/src/ltlg2mrc.html
	modified:   src/Tools/rec3d/ltlg2ps/src/ltlg2ps.html
	modified:   src/Tools/rec3d/marker2Dto3DEstimator/src/marker2Dto3DEstimator.html
	modified:   src/Tools/rec3d/mrc2Dto3D/src/mrc2Dto3D.html
	modified:   src/Tools/rec3d/mrc2Dto3DforVariation/src/mrc2Dto3DforVariation.html
	modified:   src/Tools/rec3d/mrcImageOrientationSearch/src/mrcImageOrientationSearch.html
	modified:   src/Tools/rec3d/mrcImageOrientationSearchByHigherSelection/src/mrcImageOrientationSearchByHigherSelection.html
	modified:   src/Tools/rec3d/mrcImageOrientationSearchByHybridization/src/mrcImageOrientationSearchByHybridization.html
	modified:   src/Tools/rec3d/mrcImageOrientationSearchBySimultaneousMinimization/src/mrcImageOrientationSearchBySimultaneousMinimization.html
	modified:   src/Tools/rec3d/mrcRadon2Dto3D/src/mrcRadon2Dto3D.html
	modified:   src/Tools/simulation/energyTransferModelCheck/src/energyTransferModelCheck.html
	modified:   src/Tools/simulation/muscleSimulation/src/muscleSimulation.html

 Changes not staged for commit:
	modified:   include/eosMATH.h

diff --cc .DS_Store
index 0db0426,08ecf18..0000000
deleted file mode 100644,100644
Binary files differ

diff --cc bin/wish/Display2/tclIndex
index 03796f9,c4c3f5a..bd0d716
--- 1/bin/wish/Display2/tclIndex
--- 2/bin/wish/Display2/tclIndex
+++ b/bin/wish/Display2/tclIndex
@@@ -54,7 -28,41 +54,45 @@@ set auto_index(sectionInformationWinCre
  set auto_index(ctfInformationWinCreate) [list source [file join $dir Display2Info.wish]]
  set auto_index(unitCellInformationWinCreate) [list source [file join $dir Display2Info.wish]]
  set auto_index(scaleInfoWinCreate) [list source [file join $dir Display2Info.wish]]
++<<<<<<< HEAD
 +set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
++=======
+ set auto_index(roiInformationWinCreate) [list source [file join $dir Display2InfoROI.wish]]
+ set auto_index(roiLineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
+ set auto_index(roiSplineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
+ set auto_index(roiRectangleInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
+ set auto_index(roiAnalysisFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
+ set auto_index(display2SetVar) [list source [file join $dir Display2Init.wish]]
+ set auto_index(display2InitVar) [list source [file join $dir Display2Init.wish]]
+ set auto_index(display2InitVarSet) [list source [file join $dir Display2Init.wish]]
+ set auto_index(diplay2CanvasInit) [list source [file join $dir Display2Init.wish]]
+ set auto_index(display2Init) [list source [file join $dir Display2Init.wish]]
+ set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]]
+ set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]]
+ set auto_index(menuSeqFileCreate) [list source [file join $dir Display2Menu.wish]]
+ set auto_index(menuWindowCreate) [list source [file join $dir Display2Menu.wish]]
+ set auto_index(menuInfoCreate) [list source [file join $dir Display2Menu.wish]]
+ set auto_index(menuHelpCreate) [list source [file join $dir Display2Menu.wish]]
+ set auto_index(menuExitCreate) [list source [file join $dir Display2Menu.wish]]
+ set auto_index(display2MenuSet2) [list source [file join $dir Display2Menu2.wish]]
+ set auto_index(roiRelatedObjectRecreate) [list source [file join $dir Display2MenuROI.wish]]
+ set auto_index(menuRoiCreate) [list source [file join $dir Display2MenuROI.wish]]
+ set auto_index(menuRoiCancelCommand) [list source [file join $dir Display2MenuROI.wish]]
+ set auto_index(menuRoiSingleMultiTransform) [list source [file join $dir Display2MenuROI.wish]]
+ set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuROI.wish]]
+ set auto_index(menuMultiRoiAllDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
+ set auto_index(menuMultiRoiDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
+ set auto_index(menuEditCreate) [list source [file join $dir Display2MenuROI.wish]]
+ set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
+ set auto_index(layerLineRecreate) [list source [file join $dir LayerLineUtil.wish]]
+ set auto_index(layerLineCreate) [list source [file join $dir LayerLineUtil.wish]]
+ set auto_index(layerLineClear) [list source [file join $dir LayerLineUtil.wish]]
+ set auto_index(layerLineChange) [list source [file join $dir LayerLineUtil.wish]]
+ set auto_index(projectionRecreate) [list source [file join $dir ProjectionUtil.wish]]
+ set auto_index(projectionCreate) [list source [file join $dir ProjectionUtil.wish]]
+ set auto_index(projectionClear) [list source [file join $dir ProjectionUtil.wish]]
+ set auto_index(projectionChange) [list source [file join $dir ProjectionUtil.wish]]
++>>>>>>> 11e22cd73a847db36921a031e89b7d453372a1ef
  set auto_index(roiAreaCreateStart) [list source [file join $dir RoiAreaCreate.wish]]
  set auto_index(roiAreaCreateMotion) [list source [file join $dir RoiAreaCreate.wish]]
  set auto_index(roiAreaCreateEnd) [list source [file join $dir RoiAreaCreate.wish]]

diff --cc src/Tools/.Source
Simple merge

diff --cc src/Tools/Config/Define.inc
index 2b24bf8,773ef99..9ee2d89
--- 1/src/Tools/Config/Define.inc
--- 2/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@@ -1,5 -1,4 +1,1 @@@
  WORLDNAME=Tools
- WORLDNAME=Tools
--WORLDNAME=Tools
--WORLDNAME=Tools
--WORLDNAME=Tools