Merge branch 'master' of git.osdn.jp:/gitroot/eos/base

[eos/base.git] / src / Tools / filter / mrc2hdf / src / mrc2hdf.html
diff --git a/src/Tools/filter/mrc2hdf/src/mrc2hdf.html b/src/Tools/filter/mrc2hdf/src/mrc2hdf.html

old mode 100644 (file)

new mode 100755 (executable)

index 1257a1b..218d1e9
--- a/src/Tools/filter/mrc2hdf/src/mrc2hdf.html
+++ b/src/Tools/filter/mrc2hdf/src/mrc2hdf.html
@@ -1 +1,25 @@
+<<<<<<< HEAD
+<HTML>
+<HEAD>
+<TITLE>mrc2hdf</TITLE>
+</HEAD>
+<BODY>
+<H1>mrc2hdf</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrc2hdf
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile::mrcInfo     ) ] :Optional  :Input
+    [-I[nput]            InList              (NULL      ).as(inFileList::mrcInfo ) ] :Optional  :Input:FileList
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-nres[olution]      nResolution         (1         ).as(Integer             ) ] :Optional  :Pyramidal Resolution
+    [-M[ode]             hdf5mode            (1         ).as(Integer             ) ] :Optional  :Mode:0 hdf5 1 imaris
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
+=======
  /bin/bash: mrc2hdf: そのようなファイルやディレクトリはありません
+>>>>>>> b6e641885dfb0a77e126ec979df399093a44ad39