OSDN Git Service

(root) / eos / hostdependX86LINUX64.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d03770 5aaae84)
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
authorTakuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Fri, 14 Jun 2013 22:00:31 +0000 (07:00 +0900)
committerTakuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Fri, 14 Jun 2013 22:00:31 +0000 (07:00 +0900)
Conflicts:
sbin/dotSourceInMakefileCreate
src/Makefile
src/Objects/DataExpress/Contour/doc/Contour.html
src/Objects/DataExpress/alsa/doc/alsa.html
src/Objects/DataExpress/avsFile/doc/avsFile.html
src/Objects/DataExpress/gifFile/doc/gifFile.html
src/Objects/General/.Source
src/Tools/Config/Define.inc
src/Tools/Integration/ctfDisplay/Makefile
src/Tools/Makefile
src/Tools/mrcImage/.Source
src/Tools/mrcImage/Makefile
src/Tools/mrcImage/mrcImage3DPad/src/.EosLog
src/Tools/rec3d/.Source

1  2 
src/Objects/DataExpress/Contour/doc/Contour.html patch | diff1 | diff2 | blob | history
src/Objects/DataExpress/alsa/doc/alsa.html patch | diff1 | diff2 | blob | history
src/Objects/DataExpress/avsFile/doc/avsFile.html patch | diff1 | diff2 | blob | history
src/Objects/DataExpress/gifFile/doc/gifFile.html patch | diff1 | diff2 | blob | history
src/Objects/General/.Source patch | diff1 | diff2 | blob | history
src/Tools/Config/Define.inc patch | diff1 | diff2 | blob | history
src/Tools/mrcImage/.Source patch | diff1 | diff2 | blob | history
src/Tools/mrcImage/mrcImage3DPad/src/.EosLog patch | diff1 | diff2 | blob | history
src/Tools/rec3d/.Source patch | diff1 | diff2 | blob | history

diff --cc src/Objects/DataExpress/Contour/doc/Contour.html
index 2cbefe0,18fcbfa..fd95461
--- 1/src/Objects/DataExpress/Contour/doc/Contour.html
--- 2/src/Objects/DataExpress/Contour/doc/Contour.html
+++ b/src/Objects/DataExpress/Contour/doc/Contour.html
@@@ -1,8 -1,4 +1,12 @@@
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +<H4> Update Time 06/04/13---04:48:38 </H4>
 +=======
  <H4> Update Time 06/12/13---03:05:43 </H4>
 +>>>>>>> FETCH_HEAD
++=======
++<H4> Update Time 06/12/13---03:05:43 </H4>
++>>>>>>> 5aaae841e7063b83e0574db5f3c95fa51ae1dda5
  <HR>
  <A NAME="Information">
  <H2>Information from source codes</H2>
diff --cc src/Objects/DataExpress/alsa/doc/alsa.html
index 7bf45e2,10f9ba3..a6a345c
--- 1/src/Objects/DataExpress/alsa/doc/alsa.html
--- 2/src/Objects/DataExpress/alsa/doc/alsa.html
+++ b/src/Objects/DataExpress/alsa/doc/alsa.html
@@@ -1,8 -1,4 +1,12 @@@
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +<H4> Update Time 06/04/13---04:48:41 </H4>
 +=======
  <H4> Update Time 06/12/13---03:05:39 </H4>
 +>>>>>>> FETCH_HEAD
++=======
++<H4> Update Time 06/12/13---03:05:39 </H4>
++>>>>>>> 5aaae841e7063b83e0574db5f3c95fa51ae1dda5
  <HR>
  <A NAME="Information">
  <H2>Information from source codes</H2>
diff --cc src/Objects/DataExpress/avsFile/doc/avsFile.html
index fe839c6,4566577..a60b462
--- 1/src/Objects/DataExpress/avsFile/doc/avsFile.html
--- 2/src/Objects/DataExpress/avsFile/doc/avsFile.html
+++ b/src/Objects/DataExpress/avsFile/doc/avsFile.html
@@@ -1,8 -1,4 +1,12 @@@
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +<H4> Update Time 06/04/13---04:48:42 </H4>
 +=======
  <H4> Update Time 06/12/13---03:05:41 </H4>
 +>>>>>>> FETCH_HEAD
++=======
++<H4> Update Time 06/12/13---03:05:41 </H4>
++>>>>>>> 5aaae841e7063b83e0574db5f3c95fa51ae1dda5
  <HR>
  <A NAME="Information">
  <H2>Information from source codes</H2>
diff --cc src/Objects/DataExpress/gifFile/doc/gifFile.html
index efa59f9,504673f..0552779
--- 1/src/Objects/DataExpress/gifFile/doc/gifFile.html
--- 2/src/Objects/DataExpress/gifFile/doc/gifFile.html
+++ b/src/Objects/DataExpress/gifFile/doc/gifFile.html
@@@ -1,8 -1,4 +1,12 @@@
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +<H4> Update Time 06/04/13---04:48:47 </H4>
 +=======
  <H4> Update Time 06/12/13---03:06:04 </H4>
 +>>>>>>> FETCH_HEAD
++=======
++<H4> Update Time 06/12/13---03:06:04 </H4>
++>>>>>>> 5aaae841e7063b83e0574db5f3c95fa51ae1dda5
  <HR>
  <A NAME="Information">
  <H2>Information from source codes</H2>
diff --cc src/Objects/General/.Source
index 5c19a5f,15dcad4..afd94ae
--- 1/src/Objects/General/.Source
--- 2/src/Objects/General/.Source
+++ b/src/Objects/General/.Source
@@@ -21,9 -21,4 +21,12 @@@ Socket 
  SpecialNumber \
  String \
  Vector \
++<<<<<<< HEAD
 +dummy \
 +eosList \
 +eosPThread \
 +eosPoint \
 +genUtil \
++=======
++>>>>>>> 5aaae841e7063b83e0574db5f3c95fa51ae1dda5
  #LastSource
diff --cc src/Tools/Config/Define.inc
index 9ee2d89,f105200..3d626dc
--- 1/src/Tools/Config/Define.inc
--- 2/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@@ -1,1 -1,74 +1,77 @@@
  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
+ 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
++>>>>>>> 5aaae841e7063b83e0574db5f3c95fa51ae1dda5
diff --cc src/Tools/mrcImage/.Source
index 27490c8,7fd8da1..a71bd58
--- 1/src/Tools/mrcImage/.Source
--- 2/src/Tools/mrcImage/.Source
+++ b/src/Tools/mrcImage/.Source
@@@ -100,12 -100,6 +100,15 @@@ mrcImageExpression 
  mrcImageFeatureExtraction \
  mrcImageFFT \
  mrcImageFFTLayerLineExtraction \
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +mrcImageFOMCalc \
 +mrcImageFOMCalc.org \
 +mrcImageFeatureExtraction \
 +=======
 +>>>>>>> FETCH_HEAD
++=======
++>>>>>>> 5aaae841e7063b83e0574db5f3c95fa51ae1dda5
  mrcImageFilamentSearch \
  mrcImageFilamentSearchResultShow \
  mrcImageFilterCreate \
diff --cc src/Tools/mrcImage/mrcImage3DPad/src/.EosLog
index 8c681a2,32e4c6e..c481f7c
--- 1/src/Tools/mrcImage/mrcImage3DPad/src/.EosLog
--- 2/src/Tools/mrcImage/mrcImage3DPad/src/.EosLog
+++ b/src/Tools/mrcImage/mrcImage3DPad/src/.EosLog
@@@ -26,11 -26,7 +26,17 @@@ X86LINUX64/mrcImage3DPad -htm
  /home/people/tacyas/Eos/bin/X86LINUX64/mrcImage3DPad -h 
  X86LINUX64/mrcImage3DPad -html 
  X86LINUX64/mrcImage3DPad -html 
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +X86LINUX64/mrcImage3DPad -html 
 +=======
++=======
++>>>>>>> 5aaae841e7063b83e0574db5f3c95fa51ae1dda5
  I386LINUX/mrcImage3DPad -html 
  I386LINUX/mrcImage3DPad -html 
  I386LINUX/mrcImage3DPad -html 
  I386LINUX/mrcImage3DPad -html 
++<<<<<<< HEAD
 +>>>>>>> FETCH_HEAD
++=======
++>>>>>>> 5aaae841e7063b83e0574db5f3c95fa51ae1dda5
diff --cc src/Tools/rec3d/.Source
index 9566771,0e36f7c..04d56e7
--- 1/src/Tools/rec3d/.Source
--- 2/src/Tools/rec3d/.Source
+++ b/src/Tools/rec3d/.Source
@@@ -11,11 -11,6 +11,14 @@@ FETOrientationSearchByAnnealing 
  FETOrientationSearchByFeatureAlignment \
  FETsmallMapSetCreate_forSimultaneousMinimization \
  LCalculationForOrientationSearch \
++<<<<<<< HEAD
 +ProjectionDirectionMapCreate \
 +WeightCalculationOfCommonLineSearch \
 +WeightCalculationOfCommonLineSearchByAllSinogram \
 +calcCommonLine \
 +commonLinesSearchByVoting \
++=======
++>>>>>>> 5aaae841e7063b83e0574db5f3c95fa51ae1dda5
  ll2ltlg \
  llExtract \
  llExtractCtfinfFileCreate \
binary repository for general LINUX(64bits)
About OSDN
Find Software
Develop Software
Help