OSDN Git Service
Merge remote-tracking branch 'refs/remotes/origin/master'
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 3 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/mrcImageLucasKanade
modified: env/Eos_env
modified: src/Tools/Config/Define.inc
modified: src/Tools/filter/mrc2bild/Config/OptionControlFile
modified: src/Tools/filter/mrc2bild/src/mrc2bild.html
modified: src/Tools/filter/mrc2bild/src/usage.c
modified: src/Tools/mrcImage/.Source
new file: src/Tools/mrcImage/mrcImageCurl/src/ALPHA
new file: src/Tools/mrcImage/mrcImageCurl/src/ALPHALINUX
new file: src/Tools/mrcImage/mrcImageCurl/src/ALPHALINUX5
new file: src/Tools/mrcImage/mrcImageCurl/src/ALPHAOSF1
new file: src/Tools/mrcImage/mrcImageCurl/src/CELLLINUX64
new file: src/Tools/mrcImage/mrcImageCurl/src/HP
new file: src/Tools/mrcImage/mrcImageCurl/src/I386LINUX
new file: src/Tools/mrcImage/mrcImageCurl/src/I686LINUX
new file: src/Tools/mrcImage/mrcImageCurl/src/SGI
new file: src/Tools/mrcImage/mrcImageCurl/src/SPARC
new file: src/Tools/mrcImage/mrcImageDivergence/src/ALPHA
new file: src/Tools/mrcImage/mrcImageDivergence/src/ALPHALINUX
new file: src/Tools/mrcImage/mrcImageDivergence/src/ALPHALINUX5
new file: src/Tools/mrcImage/mrcImageDivergence/src/ALPHAOSF1
new file: src/Tools/mrcImage/mrcImageDivergence/src/CELLLINUX64
new file: src/Tools/mrcImage/mrcImageDivergence/src/HP
new file: src/Tools/mrcImage/mrcImageDivergence/src/I386LINUX
new file: src/Tools/mrcImage/mrcImageDivergence/src/I686LINUX
new file: src/Tools/mrcImage/mrcImageDivergence/src/SGI
new file: src/Tools/mrcImage/mrcImageDivergence/src/SPARC
new file: src/Tools/mrcImage/mrcImageLucasKanade/Config/Define.inc
new file: src/Tools/mrcImage/mrcImageLucasKanade/Config/OptionControlFile
new file: src/Tools/mrcImage/mrcImageLucasKanade/Config/Target.inc
new file: src/Tools/mrcImage/mrcImageLucasKanade/Makefile
new file: src/Tools/mrcImage/mrcImageLucasKanade/doc/Makefile
new file: src/Tools/mrcImage/mrcImageLucasKanade/inc/config.h
new file: src/Tools/mrcImage/mrcImageLucasKanade/inc/mrcImageLucasKanade.h
new file: src/Tools/mrcImage/mrcImageLucasKanade/src/.Depend
new file: src/Tools/mrcImage/mrcImageLucasKanade/src/.Source
new file: src/Tools/mrcImage/mrcImageLucasKanade/src/Makefile
new file: src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64
new file: src/Tools/mrcImage/mrcImageLucasKanade/src/argCheck.c
new file: src/Tools/mrcImage/mrcImageLucasKanade/src/init.c
new file: src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.c
new file: src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.html
new file: src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.pane
new file: src/Tools/mrcImage/mrcImageLucasKanade/src/test/Makefile
new file: src/Tools/mrcImage/mrcImageLucasKanade/src/usage.c
new file: src/Tools/mrcImage/mrcImageLucasKanade/src/util.c
new file: src/Tools/mrcImage/mrcImageOpticalFlow/src/ALPHA
new file: src/Tools/mrcImage/mrcImageOpticalFlow/src/ALPHALINUX
new file: src/Tools/mrcImage/mrcImageOpticalFlow/src/ALPHALINUX5
new file: src/Tools/mrcImage/mrcImageOpticalFlow/src/ALPHAOSF1
new file: src/Tools/mrcImage/mrcImageOpticalFlow/src/CELLLINUX64
new file: src/Tools/mrcImage/mrcImageOpticalFlow/src/HP
new file: src/Tools/mrcImage/mrcImageOpticalFlow/src/I386LINUX
new file: src/Tools/mrcImage/mrcImageOpticalFlow/src/I686LINUX
new file: src/Tools/mrcImage/mrcImageOpticalFlow/src/SGI
new file: src/Tools/mrcImage/mrcImageOpticalFlow/src/SPARC
new file: src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/ALPHA
new file: src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/ALPHALINUX
new file: src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/ALPHALINUX5
new file: src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/ALPHAOSF1
new file: src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/CELLLINUX64
new file: src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/HP
new file: src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/I386LINUX
new file: src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/I686LINUX
new file: src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/SGI
new file: src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/SPARC
Changes not staged for commit:
modified: include/eosMATH.h