Merge remote-tracking branch 'refs/remotes/origin/master'

Merge remote-tracking branch 'refs/remotes/origin/master'

 Conflicts:
	src/Tools/eosPoint/eosPointPositionCorrection/src/eosPointPositionCorrection.html
	src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.html
	util/src/Admin/Makefile
	util/src/DataFormat/Makefile

 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.

 Committer: 安永卓生 <tacyas@yasunagatakuonoMacBook-Pro.local>

 On branch master
 Your branch and 'origin/master' have diverged,
 and have 1 and 6 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:
	modified:   bin/wish/Display2/tclIndex
	modified:   hostdepend/ARM64MAC64
	new file:   include/unicode/alphaindex.h
	new file:   include/unicode/appendable.h
	new file:   include/unicode/basictz.h
	new file:   include/unicode/brkiter.h
	new file:   include/unicode/bytestream.h
	new file:   include/unicode/bytestrie.h
	new file:   include/unicode/bytestriebuilder.h
	new file:   include/unicode/calendar.h
	new file:   include/unicode/caniter.h
	new file:   include/unicode/casemap.h
	new file:   include/unicode/char16ptr.h
	new file:   include/unicode/chariter.h
	new file:   include/unicode/choicfmt.h
	new file:   include/unicode/coleitr.h
	new file:   include/unicode/coll.h
	new file:   include/unicode/compactdecimalformat.h
	new file:   include/unicode/curramt.h
	new file:   include/unicode/currpinf.h
	new file:   include/unicode/currunit.h
	new file:   include/unicode/datefmt.h
	new file:   include/unicode/dbbi.h
	new file:   include/unicode/dcfmtsym.h
	new file:   include/unicode/decimfmt.h
	new file:   include/unicode/docmain.h
	new file:   include/unicode/dtfmtsym.h
	new file:   include/unicode/dtintrv.h
	new file:   include/unicode/dtitvfmt.h
	new file:   include/unicode/dtitvinf.h
	new file:   include/unicode/dtptngen.h
	new file:   include/unicode/dtrule.h
	new file:   include/unicode/edits.h
	new file:   include/unicode/enumset.h
	new file:   include/unicode/errorcode.h
	new file:   include/unicode/fieldpos.h
	new file:   include/unicode/filteredbrk.h
	new file:   include/unicode/fmtable.h
	new file:   include/unicode/format.h
	new file:   include/unicode/formattedvalue.h
	new file:   include/unicode/fpositer.h
	new file:   include/unicode/gender.h
	new file:   include/unicode/gregocal.h
	new file:   include/unicode/icudataver.h
	new file:   include/unicode/icuplug.h
	new file:   include/unicode/idna.h
	new file:   include/unicode/listformatter.h
	new file:   include/unicode/localebuilder.h
	new file:   include/unicode/localematcher.h
	new file:   include/unicode/localpointer.h
	new file:   include/unicode/locdspnm.h
	new file:   include/unicode/locid.h
	new file:   include/unicode/measfmt.h
	new file:   include/unicode/measunit.h
	new file:   include/unicode/measure.h
	new file:   include/unicode/messagepattern.h
	new file:   include/unicode/msgfmt.h
	new file:   include/unicode/normalizer2.h
	new file:   include/unicode/normlzr.h
	new file:   include/unicode/nounit.h
	new file:   include/unicode/numberformatter.h
	new file:   include/unicode/numberrangeformatter.h
	new file:   include/unicode/numfmt.h
	new file:   include/unicode/numsys.h
	new file:   include/unicode/parseerr.h
	new file:   include/unicode/parsepos.h
	new file:   include/unicode/platform.h
	new file:   include/unicode/plurfmt.h
	new file:   include/unicode/plurrule.h
	new file:   include/unicode/ptypes.h
	new file:   include/unicode/putil.h
	new file:   include/unicode/rbbi.h
	new file:   include/unicode/rbnf.h
	new file:   include/unicode/rbtz.h
	new file:   include/unicode/regex.h
	new file:   include/unicode/region.h
	new file:   include/unicode/reldatefmt.h
	new file:   include/unicode/rep.h
	new file:   include/unicode/resbund.h
	new file:   include/unicode/schriter.h
	new file:   include/unicode/scientificnumberformatter.h
	new file:   include/unicode/search.h
	new file:   include/unicode/selfmt.h
	new file:   include/unicode/simpleformatter.h
	new file:   include/unicode/simpletz.h
	new file:   include/unicode/smpdtfmt.h
	new file:   include/unicode/sortkey.h
	new file:   include/unicode/std_string.h
	new file:   include/unicode/strenum.h
	new file:   include/unicode/stringoptions.h
	new file:   include/unicode/stringpiece.h
	new file:   include/unicode/stringtriebuilder.h
	new file:   include/unicode/stsearch.h
	new file:   include/unicode/symtable.h
	new file:   include/unicode/tblcoll.h
	new file:   include/unicode/timezone.h
	new file:   include/unicode/tmunit.h
	new file:   include/unicode/tmutamt.h
	new file:   include/unicode/tmutfmt.h
	new file:   include/unicode/translit.h
	new file:   include/unicode/tzfmt.h
	new file:   include/unicode/tznames.h
	new file:   include/unicode/tzrule.h
	new file:   include/unicode/tztrans.h
	new file:   include/unicode/ubidi.h
	new file:   include/unicode/ubiditransform.h
	new file:   include/unicode/ubrk.h
	new file:   include/unicode/ucal.h
	new file:   include/unicode/ucasemap.h
	new file:   include/unicode/ucat.h
	new file:   include/unicode/uchar.h
	new file:   include/unicode/ucharstrie.h
	new file:   include/unicode/ucharstriebuilder.h
	new file:   include/unicode/uchriter.h
	new file:   include/unicode/uclean.h
	new file:   include/unicode/ucnv.h
	new file:   include/unicode/ucnv_cb.h
	new file:   include/unicode/ucnv_err.h
	new file:   include/unicode/ucnvsel.h
	new file:   include/unicode/ucol.h
	new file:   include/unicode/ucoleitr.h
	new file:   include/unicode/uconfig.h
	new file:   include/unicode/ucpmap.h
	new file:   include/unicode/ucptrie.h
	new file:   include/unicode/ucsdet.h
	new file:   include/unicode/ucurr.h
	new file:   include/unicode/udat.h
	new file:   include/unicode/udata.h
	new file:   include/unicode/udateintervalformat.h
	new file:   include/unicode/udatpg.h
	new file:   include/unicode/udisplaycontext.h
	new file:   include/unicode/uenum.h
	new file:   include/unicode/ufieldpositer.h
	new file:   include/unicode/uformattable.h
	new file:   include/unicode/uformattedvalue.h
	new file:   include/unicode/ugender.h
	new file:   include/unicode/uidna.h
	new file:   include/unicode/uiter.h
	new file:   include/unicode/uldnames.h
	new file:   include/unicode/ulistformatter.h
	new file:   include/unicode/uloc.h
	new file:   include/unicode/ulocdata.h
	new file:   include/unicode/umachine.h
	new file:   include/unicode/umisc.h
	new file:   include/unicode/umsg.h
	new file:   include/unicode/umutablecptrie.h
	new file:   include/unicode/unifilt.h
	new file:   include/unicode/unifunct.h
	new file:   include/unicode/unimatch.h
	new file:   include/unicode/unirepl.h
	new file:   include/unicode/uniset.h
	new file:   include/unicode/unistr.h
	new file:   include/unicode/unorm.h
	new file:   include/unicode/unorm2.h
	new file:   include/unicode/unum.h
	new file:   include/unicode/unumberformatter.h
	new file:   include/unicode/unumberrangeformatter.h
	new file:   include/unicode/unumsys.h
	new file:   include/unicode/uobject.h
	new file:   include/unicode/upluralrules.h
	new file:   include/unicode/uregex.h
	new file:   include/unicode/uregion.h
	new file:   include/unicode/ureldatefmt.h
	new file:   include/unicode/urename.h
	new file:   include/unicode/urep.h
	new file:   include/unicode/ures.h
	new file:   include/unicode/uscript.h
	new file:   include/unicode/usearch.h
	new file:   include/unicode/uset.h
	new file:   include/unicode/usetiter.h
	new file:   include/unicode/ushape.h
	new file:   include/unicode/uspoof.h
	new file:   include/unicode/usprep.h
	new file:   include/unicode/ustdio.h
	new file:   include/unicode/ustream.h
	new file:   include/unicode/ustring.h
	new file:   include/unicode/ustringtrie.h
	new file:   include/unicode/utext.h
	new file:   include/unicode/utf.h
	new file:   include/unicode/utf16.h
	new file:   include/unicode/utf32.h
	new file:   include/unicode/utf8.h
	new file:   include/unicode/utf_old.h
	new file:   include/unicode/utmscale.h
	new file:   include/unicode/utrace.h
	new file:   include/unicode/utrans.h
	new file:   include/unicode/utypes.h
	new file:   include/unicode/uvernum.h
	new file:   include/unicode/uversion.h
	new file:   include/unicode/vtzone.h
	modified:   src/Config/x86Mac64.inc
	modified:   src/Objects/DataManip/mrcImage/src/mrcImageInfo.c
	modified:   src/Tools/Config/Define.inc
	new file:   src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHA
	new file:   src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHALINUX
	new file:   src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHALINUX5
	new file:   src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHAOSF1
	new file:   src/Tools/eosPoint/eosPointPositionCorrection/src/CELLLINUX64
	new file:   src/Tools/eosPoint/eosPointPositionCorrection/src/HP
	new file:   src/Tools/eosPoint/eosPointPositionCorrection/src/I386LINUX
	new file:   src/Tools/eosPoint/eosPointPositionCorrection/src/I686LINUX
	new file:   src/Tools/eosPoint/eosPointPositionCorrection/src/SGI
	new file:   src/Tools/eosPoint/eosPointPositionCorrection/src/SPARC
	new file:   src/Tools/eosPoint/eosPointPositionCorrection/src/X86LINUX64
	modified:   src/Tools/eosPoint/eosPointPositionCorrection/src/eosPointPositionCorrection.html
	modified:   src/Tools/filter/mrc2hdf/src/Makefile
	modified:   src/Tools/filter/mrc2hdf/src/test/Makefile
	modified:   src/Tools/mrcImage/.Source
	modified:   src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/Config/OptionControlFile
	modified:   src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/inc/mrcImageBlurByTemperatureFactor.h
	modified:   src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/argCheck.c
	modified:   src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/init.c
	modified:   src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/mrcImageBlurByTemperatureFactor.c
	modified:   src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/mrcImageBlurByTemperatureFactor.pane
	modified:   src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/usage.c
	modified:   src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.c
	modified:   src/Tools/mrcImage/mrcImageInfo/src/test/Makefile
	modified:   src/Tools/mrcImage/mrcImageLucasKanade/Config/OptionControlFile
	modified:   src/Tools/mrcImage/mrcImageLucasKanade/inc/mrcImageLucasKanade.h
	modified:   src/Tools/mrcImage/mrcImageLucasKanade/src/argCheck.c
	modified:   src/Tools/mrcImage/mrcImageLucasKanade/src/init.c
	modified:   src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.c
	modified:   src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.html
	modified:   src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.pane
	modified:   src/Tools/mrcImage/mrcImageLucasKanade/src/usage.c
	deleted:    "src/Tools/pdbUtil/q\177\177\177\177"
	new file:   util/src/Admin/Makefile
	new file:   util/src/DataFormat/Makefile

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