Changeset 397 for library/doc/html/install.html

Timestamp:

06/24/09 21:56:30 (16 years ago)

Author:

smidl

Message:

doc

Files:

• library/doc/html/install.html (modified) (1 diff)

library/doc/html/install.html

@@ -99 +99 @@
 The default cmake configuration is looking for itpp in directory mac/itpp, make sure you have symlinks to this directory.<p>
 If itpp compilation is successfull, you can run Cmake. Fill in the paths to your BDM directory, run Configure followed by Create. Configuration files for your favourite build environment should be created in the BDM directory. </div>
+<<<<<<< HEAD:library/doc/html/install.html
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:46 2009 for mixpp by&nbsp;
+=======
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:50 2009 for mixpp by&nbsp;
+>>>>>>> doc:library/doc/html/install.html
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.9 </small></address>