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

 Conflicts:
	src/Tools/Config/Define.inc

 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
 Your branch and 'origin/master' have diverged,
 and have 1 and 4 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:   include/Crystal.h
	modified:   src/Objects/DataManip/mrcImage/src/lmrcImageCrystalCreate.c
	modified:   src/Objects/General/Crystal/doc/Crystal.html
	modified:   src/Objects/General/Crystal/inc/Crystal.h
	modified:   src/Objects/General/Crystal/src/crystalUtil.c
	modified:   src/Tools/.Source
	modified:   src/Tools/.Source.org
	modified:   src/Tools/Config/Define.inc
	new file:   src/Tools/crystal/.Source.org
	new file:   src/Tools/crystal/Config/Define.inc
	new file:   src/Tools/crystal/Makefile
	new file:   src/Tools/crystal/crystalGetLatticeVolume/Config/Define.inc
	new file:   src/Tools/crystal/crystalGetLatticeVolume/Config/OptionControlFile
	new file:   src/Tools/crystal/crystalGetLatticeVolume/Config/Target.inc
	new file:   src/Tools/crystal/crystalGetLatticeVolume/Makefile
	new file:   src/Tools/crystal/crystalGetLatticeVolume/doc/Makefile
	new file:   src/Tools/crystal/crystalGetLatticeVolume/inc/config.h
	new file:   src/Tools/crystal/crystalGetLatticeVolume/inc/crystalGetLatticeVolume.h
	new file:   src/Tools/crystal/crystalGetLatticeVolume/src/.Depend
	new file:   src/Tools/crystal/crystalGetLatticeVolume/src/.Source
	new file:   src/Tools/crystal/crystalGetLatticeVolume/src/Makefile
	new file:   src/Tools/crystal/crystalGetLatticeVolume/src/X86MAC64
	new file:   src/Tools/crystal/crystalGetLatticeVolume/src/argCheck.c
	new file:   src/Tools/crystal/crystalGetLatticeVolume/src/crystalGetLatticeVolume.c
	new file:   src/Tools/crystal/crystalGetLatticeVolume/src/crystalGetLatticeVolume.pane
	new file:   src/Tools/crystal/crystalGetLatticeVolume/src/init.c
	new file:   src/Tools/crystal/crystalGetLatticeVolume/src/test/Makefile
	new file:   src/Tools/crystal/crystalGetLatticeVolume/src/test/data
	new file:   src/Tools/crystal/crystalGetLatticeVolume/src/usage.c
	new file:   src/Tools/crystal/crystalGetLatticeVolume/src/util.c
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/Config/Define.inc
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/Config/OptionControlFile
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/Config/Target.inc
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/Makefile
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/doc/Makefile
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/inc/config.h
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/inc/crystalGetReciprocalLattice.h
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/src/.Depend
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/src/.Source
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/src/Makefile
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/src/X86MAC64
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/src/argCheck.c
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/src/crystalGetReciprocalLattice.c
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/src/crystalGetReciprocalLattice.pane
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/src/init.c
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/src/usage.c
	new file:   src/Tools/crystal/crystalGetReciprocalLattice/src/util.c
	modified:   src/Tools/filter/mrc2tiff/src/mrc2tiff.c
	modified:   src/Tools/mrcImage/mrcImageFeatureCalc/Config/OptionControlFile
	modified:   src/Tools/mrcImage/mrcImageFeatureCalc/inc/mrcImageFeatureCalc.h
	modified:   src/Tools/mrcImage/mrcImageFeatureCalc/src/argCheck.c
	modified:   src/Tools/mrcImage/mrcImageFeatureCalc/src/init.c
	modified:   src/Tools/mrcImage/mrcImageFeatureCalc/src/mrcImageFeatureCalc.c
	modified:   src/Tools/mrcImage/mrcImageFeatureCalc/src/mrcImageFeatureCalc.pane
	modified:   src/Tools/mrcImage/mrcImageFeatureCalc/src/usage.c
	modified:   src/Tools/mrcImage/mrcMask/src/mrcMask.c
	new file:   util/src/DataFormat/Makefile
	modified:   util/src/Makefile
	new file:   util/src/TclTk/VTK-6.3.0.zip

diff --cc src/Tools/Config/Define.inc
index 39d321e,cf59306..9ee2d89
--- 1/src/Tools/Config/Define.inc
--- 2/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@@ -1,3 -1,62 +1,1 @@@
  WORLDNAME=Tools
 -<<<<<<< HEAD
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -<<<<<<< HEAD
 -=======
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
 -WORLDNAME=Tools
--WORLDNAME=Tools
--WORLDNAME=Tools
 -=======
 ->>>>>>> refs/remotes/origin/master
 ->>>>>>> 095c177e7074abc54cbfef5b79eeef49f6aabf12