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

 Conflicts:
	bin/X86MAC64/mrcImageCrystalCreate
	lib/X86MAC64/libEosObjects.a
	lib/X86MAC64/libmrcImage.a
	lib/X86MAC64/shared/lmrcImageCrystalCreate.sharedo
	src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a
	src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a
	src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCrystalCreate.debugo
	src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCrystalCreate.o
	src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCrystalCreate.sharedo
	src/Tools/mrcImage/mrcImageCrystalCreate/src/X86MAC64/mrcImageCrystalCreate
	src/Tools/mrcImage/mrcImageFeatureCalc/src/X86MAC64/argCheck.o
	src/Tools/mrcImage/mrcImageFeatureCalc/src/X86MAC64/init.o
	src/Tools/mrcImage/mrcImageFeatureCalc/src/X86MAC64/mrcImageFeatureCalc.o
	src/Tools/mrcImage/mrcImageFeatureCalc/src/X86MAC64/usage.o

 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.

 On branch master
 All conflicts fixed but you are still merging.

 Changes to be committed:
	modified:   bin/X86MAC64/mrcImage3DPad
	modified:   lib/X86MAC64/shared/lmrcImage3DPad.sharedo
	modified:   lib/X86MAC64/shared/lmrcImageFeatureCalc.sharedo
	modified:   src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImage3DPad.debugo
	modified:   src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImage3DPad.o
	modified:   src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImage3DPad.sharedo
	deleted:    src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFeatureCalc.debugo
	deleted:    src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFeatureCalc.o
	deleted:    src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageFeatureCalc.sharedo
	new file:   src/Objects/DataManip/rigakuImage/src/X86MAC64/.Depend
	new file:   src/Objects/DataManip/rigakuImage/src/X86MAC64/.Source
	new file:   src/Objects/DataManip/rigakuImage/src/X86MAC64/X86MAC64
	modified:   src/Tools/eosPoint/eosPointICP/src/X86MAC64/argCheck.o
	modified:   src/Tools/eosPoint/eosPointICP/src/X86MAC64/eosPointICP
	modified:   src/Tools/eosPoint/eosPointICP/src/X86MAC64/eosPointICP.o
	modified:   src/Tools/eosPoint/eosPointICP/src/X86MAC64/init.o
	modified:   src/Tools/eosPoint/eosPointICP/src/X86MAC64/usage.o
	modified:   src/Tools/eosPoint/eosPointICP/src/X86MAC64/util.o
	modified:   src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/.Depend
	new file:   src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/argCheck.debugo
	modified:   src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/argCheck.o
	new file:   src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/init.debugo
	modified:   src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/init.o
	modified:   src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/mrcImage3DPad
	new file:   src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/mrcImage3DPad.debug
	new file:   src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/mrcImage3DPad.debugo
	modified:   src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/mrcImage3DPad.o
	new file:   src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/usage.debugo
	modified:   src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/usage.o
	new file:   src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/util.debugo
	modified:   src/Tools/mrcImage/mrcImage3DPad/src/X86MAC64/util.o
	modified:   src/Tools/mrcImage/mrcImageCrystalCreate/src/X86MAC64/argCheck.o
	modified:   src/Tools/mrcImage/mrcImageCrystalCreate/src/X86MAC64/init.o
	modified:   src/Tools/mrcImage/mrcImageCrystalCreate/src/X86MAC64/mrcImageCrystalCreate.o
	modified:   src/Tools/mrcImage/mrcImageCrystalCreate/src/X86MAC64/usage.o
	modified:   src/Tools/mrcImage/mrcImageCrystalCreate/src/X86MAC64/util.o
	new file:   src/Tools/mrcImage/mrcImageCrystalDeform/src/X86MAC64/.Depend
	modified:   src/Tools/mrcImage/mrcImageFeatureCalc/src/X86MAC64/util.o
	modified:   util/X86MAC64/share/gdb/python/gdb/FrameDecorator.pyc
	modified:   util/X86MAC64/share/gdb/python/gdb/FrameIterator.pyc
	modified:   util/X86MAC64/share/gdb/python/gdb/__init__.pyc
	modified:   util/X86MAC64/share/gdb/python/gdb/command/__init__.pyc
	modified:   util/X86MAC64/share/gdb/python/gdb/command/bound_registers.pyc
	modified:   util/X86MAC64/share/gdb/python/gdb/command/explore.pyc
	modified:   util/X86MAC64/share/gdb/python/gdb/command/frame_filters.pyc
	modified:   util/X86MAC64/share/gdb/python/gdb/command/pretty_printers.pyc
	modified:   util/X86MAC64/share/gdb/python/gdb/command/prompt.pyc
	modified:   util/X86MAC64/share/gdb/python/gdb/command/type_printers.pyc
	modified:   util/X86MAC64/share/gdb/python/gdb/command/xmethods.pyc
	modified:   util/X86MAC64/share/gdb/python/gdb/frames.pyc
	modified:   util/X86MAC64/share/gdb/python/gdb/function/__init__.pyc
	modified:   util/X86MAC64/share/gdb/python/gdb/function/strfns.pyc
	modified:   util/X86MAC64/share/gdb/python/gdb/printing.pyc
	modified:   util/X86MAC64/share/gdb/python/gdb/prompt.pyc
	modified:   util/X86MAC64/share/gdb/python/gdb/types.pyc