OSDN Git Service
Merge branch 'master' of git.osdn.jp:/gitroot/eos/base
Conflicts:
src/Tools/Config/Define.inc
src/Tools/mrcImage/mrcImageFeatureCalc/src/mrcImageFeatureCalc.pane
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 13 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:
new file: bin/mrcImageDensityWeightedAreaCalc
modified: include/lmrcImageCalcArea.h
modified: include/lmrcImageCrystalCreate.h
modified: include/lmrcImageFeatureCalc.h
modified: include/lmrcImageNormalizing.h
new file: src/Objects/DataManip/mrcImage/src/:w
modified: src/Objects/DataManip/mrcImage/src/lmrcImageCalcArea.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageCalcArea.h
modified: src/Objects/DataManip/mrcImage/src/lmrcImageCrystalCreate.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageCrystalCreate.h
modified: src/Objects/DataManip/mrcImage/src/lmrcImageFeatureCalc.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageFeatureCalc.h
modified: src/Objects/DataManip/mrcImage/src/lmrcImageNormalizing.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageNormalizing.h
modified: src/Objects/DataManip/mrcImage/src/mrcImageInfo.c
modified: src/Objects/Makefile
modified: src/Tools/Config/Define.inc
modified: src/Tools/eosPoint/.Source.org
modified: src/Tools/eosPoint/eosPointICP/Config/OptionControlFile
modified: src/Tools/eosPoint/eosPointICP/inc/eosPointICP.h
new file: src/Tools/eosPoint/eosPointICP/inc/eosPointICP.h.org
modified: src/Tools/eosPoint/eosPointICP/src/argCheck.c
modified: src/Tools/eosPoint/eosPointICP/src/eosPointICP.c
modified: src/Tools/eosPoint/eosPointICP/src/eosPointICP.pane
modified: src/Tools/eosPoint/eosPointICP/src/init.c
new file: src/Tools/eosPoint/eosPointICP/src/test/Makefile
new file: src/Tools/eosPoint/eosPointICP/src/test/data
modified: src/Tools/eosPoint/eosPointICP/src/usage.c
modified: src/Tools/mrcImage/.Source
modified: src/Tools/mrcImage/.Source.org
modified: src/Tools/mrcImage/mrcImage3DPad2/src/mrcImage3DPad2.c
modified: src/Tools/mrcImage/mrcImageCrystalCreate/Config/OptionControlFile
modified: src/Tools/mrcImage/mrcImageCrystalCreate/inc/mrcImageCrystalCreate.h
modified: src/Tools/mrcImage/mrcImageCrystalCreate/src/argCheck.c
modified: src/Tools/mrcImage/mrcImageCrystalCreate/src/init.c
modified: src/Tools/mrcImage/mrcImageCrystalCreate/src/mrcImageCrystalCreate.c
modified: src/Tools/mrcImage/mrcImageCrystalCreate/src/mrcImageCrystalCreate.html
modified: src/Tools/mrcImage/mrcImageCrystalCreate/src/mrcImageCrystalCreate.pane
new file: src/Tools/mrcImage/mrcImageCrystalCreate/src/test/Makefile
new file: src/Tools/mrcImage/mrcImageCrystalCreate/src/test/data
modified: src/Tools/mrcImage/mrcImageCrystalCreate/src/usage.c
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/Config/Define.inc
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/Config/OptionControlFile
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/Config/Target.inc
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/Makefile
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/doc/Makefile
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/inc/config.h
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/inc/mrcImageDensityWeightedAreaCalc.h
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/src/.Depend
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/src/.Source
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/src/Makefile
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/src/X86MAC64
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/src/argCheck.c
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/src/init.c
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/src/mrcImageDensityWeightedAreaCalc.c
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/src/mrcImageDensityWeightedAreaCalc.html
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/src/mrcImageDensityWeightedAreaCalc.pane
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/src/test/Makefile
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/src/test/data
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/src/usage.c
new file: src/Tools/mrcImage/mrcImageDensityWeightedAreaCalc/src/util.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.html
modified: src/Tools/mrcImage/mrcImageFeatureCalc/src/mrcImageFeatureCalc.pane
modified: src/Tools/mrcImage/mrcImageFeatureCalc/src/usage.c