recompiled:

[eos/hostdependX86LINUX64.git] / src / Tools / filter / mrc2bild / src / X86LINUX64 / .Depend

diff --git a/src/Tools/filter/mrc2bild/src/X86LINUX64/.Depend b/src/Tools/filter/mrc2bild/src/X86LINUX64/.Depend
index 21b7af5..4c8b34c 100644 (file)
--- a/src/Tools/filter/mrc2bild/src/X86LINUX64/.Depend
+++ b/src/Tools/filter/mrc2bild/src/X86LINUX64/.Depend
@@ -20,25 +20,15 @@ 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 ../inc/../inc/mrc2bild.h \
-<<<<<<< HEAD
  /home/tacyas/Eos/include/genUtil.h /usr/include/values.h \
-=======
- /home/people/Eos/Eos/include/genUtil.h /usr/include/values.h \
->>>>>>> 4a37b0bd13c46a2cb94c7ef1ef847d45bafe78f3
  /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 \
  /usr/include/limits.h /usr/include/bits/posix1_lim.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/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \
  /home/tacyas/Eos/include/Memory.h
-=======
- /home/people/Eos/Eos/include/eosString.h \
- /home/people/Eos/Eos/include/File.h \
- /home/people/Eos/Eos/include/Memory.h
->>>>>>> 4a37b0bd13c46a2cb94c7ef1ef847d45bafe78f3
 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,25 +51,15 @@ 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 ../inc/../inc/mrc2bild.h \
-<<<<<<< HEAD
  /home/tacyas/Eos/include/genUtil.h /usr/include/values.h \
-=======
- /home/people/Eos/Eos/include/genUtil.h /usr/include/values.h \
->>>>>>> 4a37b0bd13c46a2cb94c7ef1ef847d45bafe78f3
  /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 \
  /usr/include/limits.h /usr/include/bits/posix1_lim.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/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \
  /home/tacyas/Eos/include/Memory.h
-=======
- /home/people/Eos/Eos/include/eosString.h \
- /home/people/Eos/Eos/include/File.h \
- /home/people/Eos/Eos/include/Memory.h
->>>>>>> 4a37b0bd13c46a2cb94c7ef1ef847d45bafe78f3
 mrc2bild.o: mrc2bild.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 \
@@ -102,32 +82,17 @@ mrc2bild.o: mrc2bild.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 ../inc/../inc/mrc2bild.h \
-<<<<<<< HEAD
  /home/tacyas/Eos/include/genUtil.h /usr/include/values.h \
-=======
- /home/people/Eos/Eos/include/genUtil.h /usr/include/values.h \
->>>>>>> 4a37b0bd13c46a2cb94c7ef1ef847d45bafe78f3
  /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 \
  /usr/include/limits.h /usr/include/bits/posix1_lim.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/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 \
  /home/tacyas/Eos/include/bildFile.h /home/tacyas/Eos/include/mrcImage.h
-=======
- /home/people/Eos/Eos/include/mrcImage.h \
- /home/people/Eos/Eos/include/genUtil.h \
- /home/people/Eos/Eos/include/Matrix3D.h \
- /home/people/Eos/Eos/include/Vector.h \
- /home/people/Eos/Eos/include/Array.h \
- /home/people/Eos/Eos/include/ctfInfo.h \
- /home/people/Eos/Eos/include/bildFile.h \
- /home/people/Eos/Eos/include/mrcImage.h
->>>>>>> 4a37b0bd13c46a2cb94c7ef1ef847d45bafe78f3
 usage.o: usage.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 \