Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base into HEAD

Conflicts:
	src/Objects/DataManip/transform/doc/transform.html
	src/Objects/DataManip/transform/src/lmrc2Dto3D.c
	src/Objects/DataManip/transform/src/lmrc3Dto2D.c
	src/Objects/General/eosPThread/Makefile
	src/Tools/rec3d/mrc2Dto3D/src/.EosLog
	src/Tools/rec3d/mrc2Dto3D/src/test/Makefile
	src/Tools/rec3d/mrc3Dto2D/src/.EosLog
	src/Tools/rec3d/mrc3Dto2D/src/Makefile

diff --cc src/Objects/DataManip/transform/doc/transform.html
index 1969140,8ae5727..f64bf87
--- 1/src/Objects/DataManip/transform/doc/transform.html
--- 2/src/Objects/DataManip/transform/doc/transform.html
+++ b/src/Objects/DataManip/transform/doc/transform.html
@@@ -65,7 -65,6 +65,7 @@@
  ../src/lmrcImageOneLineGet.c:
  
  ../src/lmrcImageSinogramCorrelationAdditionalWeight.c:
- >>>>>>> Apply eosPThread to mrc2Dto3D, -pthread
++=======
  </PRE>
  <HR>
  <A NAME="include">

diff --cc src/Objects/DataManip/transform/src/lmrc3Dto2D.c
index 18e867c,7c3ac53..de8ca05
--- 1/src/Objects/DataManip/transform/src/lmrc3Dto2D.c
--- 2/src/Objects/DataManip/transform/src/lmrc3Dto2D.c
+++ b/src/Objects/DataManip/transform/src/lmrc3Dto2D.c
@@@ -282,6 -280,6 +282,7 @@@ lmrcImage3Dto2D(mrcImage* dst, mrcImage
                llinfo[iThread].section  = section;
                outSection[iThread] = count;
  
++
                //
                if(__eosPThread__) {
                        //

diff --cc src/Tools/rec3d/mrc2Dto3D/src/.EosLog
index 787dc7b,c1d6566..feb1739
--- 1/src/Tools/rec3d/mrc2Dto3D/src/.EosLog
--- 2/src/Tools/rec3d/mrc2Dto3D/src/.EosLog
+++ b/src/Tools/rec3d/mrc2Dto3D/src/.EosLog
@@@ -220,5 -220,4 +220,3 @@@ X86MAC64/mrc2Dto3D -i test/data/test.mr
  /Applications/Eos.app/Eos/hostdepend/X86MAC64/src/Tools/rec3d/mrc2Dto3D/src/X86MAC64/mrc2Dto3D.debug -i data/test.mrc2d3d -o data/test.mrc2d3d.mrc3d -Double -CounterThreshold 1 -WeightMode 3 -m 1 -InterpolationMode 2 -DoubleCounter data/test.mrc2d3d.mrc3d.counter 
  /Applications/Eos.app/Eos/hostdepend/X86MAC64/src/Tools/rec3d/mrc2Dto3D/src/X86MAC64/mrc2Dto3D.debug -i data/test.mrc2d3d -o data/test.mrc2d3d.mrc3d -Double -CounterThreshold 1 -WeightMode 3 -m 1 -InterpolationMode 2 -DoubleCounter data/test.mrc2d3d.mrc3d.counter -pthread 14 
  X86MAC64/mrc2Dto3D -html 
--X86MAC64/mrc2Dto3D -html 
- X86LINUX64/mrc2Dto3D -html