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

[eos/base.git] / src / Objects / General / Vector / doc / Vector.html

diff --git a/src/Objects/General/Vector/doc/Vector.html b/src/Objects/General/Vector/doc/Vector.html
index bcf245a..e1f636e 100755 (executable)
--- a/src/Objects/General/Vector/doc/Vector.html
+++ b/src/Objects/General/Vector/doc/Vector.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 <H4> Update Time 06/15/13---00:21:55 </H4>
+=======
+<H4> Update Time 06/15/13---09:36:33 </H4>
+>>>>>>> FETCH_HEAD
 <ul>
        <li>extern floatVector* floatVectorAdd(floatVector* v, floatVector* u, floatVector* w);
        <li>extern floatVector* floatVectorMinus(floatVector* v, floatVector* u, floatVector* w);
@@ -11,13 +15,13 @@
 <H2>Information from source codes</H2>
 </A>
 <PRE>
-../src/lVectorSpline2D.c:
-
 ../src/Vector.c:
 
 ../src/VectorRead.c:
 
 ../src/VectorScalarProduct.c:
+
+../src/lVectorSpline2D.c:
 </PRE>
 <HR>
 <A NAME="include">