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 is ahead of 'origin/master' by 1 commit.
   (use "git push" to publish your local commits)

 Changes to be committed:
	modified:   bin/X86LINUX64/mrc2hdf
	modified:   bin/X86LINUX64/mrcImageLucasKanade
	modified:   bin/X86LINUX64/mrcImageOpticalFlow
	new file:   src/Tools/filter/mrc2hdf/src/X86LINUX64/argCheck.debugo
	new file:   src/Tools/filter/mrc2hdf/src/X86LINUX64/init.debugo
	modified:   src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf
	new file:   src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf.debug
	new file:   src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf.debugo
	modified:   src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf.o
	new file:   src/Tools/filter/mrc2hdf/src/X86LINUX64/usage.debugo
	new file:   src/Tools/filter/mrc2hdf/src/X86LINUX64/util.debugo
	modified:   src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/argCheck.o
	modified:   src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/init.o
	modified:   src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/mrcImageLucasKanade
	modified:   src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/mrcImageLucasKanade.o
	modified:   src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/usage.o
	modified:   src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/.Depend
	modified:   src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/mrcImageOpticalFlow

diff --git a/bin/X86LINUX64/mrc2hdf b/bin/X86LINUX64/mrc2hdf
index 73e4520..a69cc26 100755 (executable)
Binary files a/bin/X86LINUX64/mrc2hdf and b/bin/X86LINUX64/mrc2hdf differ

diff --git a/bin/X86LINUX64/mrcImageLucasKanade b/bin/X86LINUX64/mrcImageLucasKanade
index 1502bd3..1b7a0dc 100755 (executable)
Binary files a/bin/X86LINUX64/mrcImageLucasKanade and b/bin/X86LINUX64/mrcImageLucasKanade differ

diff --git a/bin/X86LINUX64/mrcImageOpticalFlow b/bin/X86LINUX64/mrcImageOpticalFlow
index 4c75522..283a4df 100755 (executable)
Binary files a/bin/X86LINUX64/mrcImageOpticalFlow and b/bin/X86LINUX64/mrcImageOpticalFlow differ

diff --git a/src/Tools/filter/mrc2hdf/src/X86LINUX64/argCheck.debugo b/src/Tools/filter/mrc2hdf/src/X86LINUX64/argCheck.debugo
new file mode 100644 (file)
index 0000000..ffbed56
Binary files /dev/null and b/src/Tools/filter/mrc2hdf/src/X86LINUX64/argCheck.debugo differ

diff --git a/src/Tools/filter/mrc2hdf/src/X86LINUX64/init.debugo b/src/Tools/filter/mrc2hdf/src/X86LINUX64/init.debugo
new file mode 100644 (file)
index 0000000..e641504
Binary files /dev/null and b/src/Tools/filter/mrc2hdf/src/X86LINUX64/init.debugo differ

diff --git a/src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf b/src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf
index 73e4520..a69cc26 100755 (executable)
Binary files a/src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf and b/src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf differ

diff --git a/src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf.debug b/src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf.debug
new file mode 100755 (executable)
index 0000000..892277b
Binary files /dev/null and b/src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf.debug differ

diff --git a/src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf.debugo b/src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf.debugo
new file mode 100644 (file)
index 0000000..9be7409
Binary files /dev/null and b/src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf.debugo differ

diff --git a/src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf.o b/src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf.o
index a335b40..f86da2b 100644 (file)
Binary files a/src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf.o and b/src/Tools/filter/mrc2hdf/src/X86LINUX64/mrc2hdf.o differ

diff --git a/src/Tools/filter/mrc2hdf/src/X86LINUX64/usage.debugo b/src/Tools/filter/mrc2hdf/src/X86LINUX64/usage.debugo
new file mode 100644 (file)
index 0000000..12edb7b
Binary files /dev/null and b/src/Tools/filter/mrc2hdf/src/X86LINUX64/usage.debugo differ

diff --git a/src/Tools/filter/mrc2hdf/src/X86LINUX64/util.debugo b/src/Tools/filter/mrc2hdf/src/X86LINUX64/util.debugo
new file mode 100644 (file)
index 0000000..f5387c8
Binary files /dev/null and b/src/Tools/filter/mrc2hdf/src/X86LINUX64/util.debugo differ

diff --git a/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/argCheck.o b/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/argCheck.o
index 64f7d4d..80b7bfd 100644 (file)
Binary files a/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/argCheck.o and b/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/argCheck.o differ

diff --git a/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/init.o b/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/init.o
index 4f7fa7b..0fe3ee1 100644 (file)
Binary files a/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/init.o and b/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/init.o differ

diff --git a/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/mrcImageLucasKanade b/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/mrcImageLucasKanade
index 1502bd3..1b7a0dc 100755 (executable)
Binary files a/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/mrcImageLucasKanade and b/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/mrcImageLucasKanade differ

diff --git a/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/mrcImageLucasKanade.o b/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/mrcImageLucasKanade.o
index 32c05a1..34cea43 100644 (file)
Binary files a/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/mrcImageLucasKanade.o and b/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/mrcImageLucasKanade.o differ

diff --git a/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/usage.o b/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/usage.o
index 86d0262..fc02903 100644 (file)
Binary files a/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/usage.o and b/src/Tools/mrcImage/mrcImageLucasKanade/src/X86LINUX64/usage.o differ

diff --git a/src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/.Depend b/src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/.Depend
index f1b5f4c..4255464 100644 (file)
--- a/src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/.Depend
+++ b/src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/.Depend
@@ -20,11 +20,7 @@ argCheck.o: argCheck.c /usr/include/stdc-predef.h /usr/include/stdio.h \
  /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \
  /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
  /usr/include/bits/mathcalls.h ../inc/config.h \
-<<<<<<< HEAD
- ../inc/../inc/mrcImageOpticalFlow.h /home/enokida/Eos/include/genUtil.h \
-=======
  ../inc/../inc/mrcImageOpticalFlow.h /home/tacyas/Eos/include/genUtil.h \
->>>>>>> refs/remotes/origin/master
  /usr/include/values.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/limits.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/syslimits.h \
@@ -32,13 +28,8 @@ argCheck.o: argCheck.c /usr/include/stdc-predef.h /usr/include/stdio.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
  /usr/include/bits/posix2_lim.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/float.h \
-<<<<<<< HEAD
- /home/enokida/Eos/include/eosString.h /home/enokida/Eos/include/File.h \
- /home/enokida/Eos/include/Memory.h
-=======
  /home/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \
  /home/tacyas/Eos/include/Memory.h
->>>>>>> refs/remotes/origin/master
 init.o: init.c /usr/include/stdc-predef.h /usr/include/stdio.h \
  /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
@@ -61,11 +52,7 @@ init.o: init.c /usr/include/stdc-predef.h /usr/include/stdio.h \
  /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \
  /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
  /usr/include/bits/mathcalls.h ../inc/config.h \
-<<<<<<< HEAD
- ../inc/../inc/mrcImageOpticalFlow.h /home/enokida/Eos/include/genUtil.h \
-=======
  ../inc/../inc/mrcImageOpticalFlow.h /home/tacyas/Eos/include/genUtil.h \
->>>>>>> refs/remotes/origin/master
  /usr/include/values.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/limits.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/syslimits.h \
@@ -73,13 +60,8 @@ init.o: init.c /usr/include/stdc-predef.h /usr/include/stdio.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
  /usr/include/bits/posix2_lim.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/float.h \
-<<<<<<< HEAD
- /home/enokida/Eos/include/eosString.h /home/enokida/Eos/include/File.h \
- /home/enokida/Eos/include/Memory.h
-=======
  /home/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \
  /home/tacyas/Eos/include/Memory.h
->>>>>>> refs/remotes/origin/master
 mrcImageOpticalFlow.o: mrcImageOpticalFlow.c /usr/include/stdc-predef.h \
  /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
@@ -151,17 +133,10 @@ mrcImageOpticalFlow.o: mrcImageOpticalFlow.c /usr/include/stdc-predef.h \
  /usr/include/gsl/gsl_vector.h /usr/include/gsl/gsl_blas.h \
  /usr/include/gsl/gsl_blas_types.h /usr/include/gsl/gsl_cblas.h \
  ../inc/config.h ../inc/../inc/mrcImageOpticalFlow.h \
-<<<<<<< HEAD
- /home/enokida/Eos/include/genUtil.h /usr/include/values.h \
- /home/enokida/Eos/include/mrcImage.h /home/enokida/Eos/include/genUtil.h \
- /home/enokida/Eos/include/Matrix3D.h /home/enokida/Eos/include/Vector.h \
- /home/enokida/Eos/include/Array.h /home/enokida/Eos/include/ctfInfo.h \
-=======
  /home/tacyas/Eos/include/genUtil.h /usr/include/values.h \
  /home/tacyas/Eos/include/mrcImage.h /home/tacyas/Eos/include/genUtil.h \
  /home/tacyas/Eos/include/Matrix3D.h /home/tacyas/Eos/include/Vector.h \
  /home/tacyas/Eos/include/Array.h /home/tacyas/Eos/include/ctfInfo.h \
->>>>>>> refs/remotes/origin/master
  ../inc/mrcImageOpticalFlow.h
 usage.o: usage.c /usr/include/stdc-predef.h /usr/include/stdio.h \
  /usr/include/features.h /usr/include/sys/cdefs.h \

diff --git a/src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/mrcImageOpticalFlow b/src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/mrcImageOpticalFlow
index 4c75522..283a4df 100755 (executable)
Binary files a/src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/mrcImageOpticalFlow and b/src/Tools/mrcImage/mrcImageOpticalFlow/src/X86LINUX64/mrcImageOpticalFlow differ