Skip to content

Commit

Permalink
Merge commit 'c59e5cacd2e9076308d224297a404370ba44be21'
Browse files Browse the repository at this point in the history
# Conflicts:
#	docs/_sources/api-matlab/program_listing_file__Users_enrico_Ricerca_develop_C++_pins-mechatronix_LibSources_submodules_Splines_toolbox_lib_CompileSplinesLib.m.rst.txt
#	docs/api-matlab/program_listing_file__Users_enrico_Ricerca_develop_C++_pins-mechatronix_LibSources_submodules_Splines_toolbox_lib_CompileSplinesLib.m.html
#	docs/objects.inv
#	docs/searchindex.js
  • Loading branch information
ebertolazzi committed Apr 2, 2021
2 parents b327232 + c59e5ca commit d87f127
Show file tree
Hide file tree
Showing 9 changed files with 78 additions and 206 deletions.
7 changes: 4 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,11 @@ To run the test
rake run # using rake on linux and osx
rake run_win # using rake on windows
Online Documentation
--------------------
Documentation and home
----------------------

Available at: http://ebertolazzi.github.io/Splines
- http://ebertolazzi.github.io/Splines
- https://github.com/ebertolazzi/Splines

Developer
---------
Expand Down
132 changes: 0 additions & 132 deletions README_OLD.md

This file was deleted.

2 changes: 1 addition & 1 deletion docs/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 3d34a6afae63f155f41ce9d9a844bfb3
config: 705a259653000f25fcf3daf23870120c
tags: 645f666f9bcd5a90fca523b33c5a78b7
54 changes: 27 additions & 27 deletions docs/_static/cloud.css
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ body


margin: 1em 1em 0;
background: #1A4162;
background: #6f6700;
background-attachment: fixed;

}
Expand Down Expand Up @@ -231,7 +231,7 @@ div.related
{
margin: 0 auto;
max-width: 11.5in;
background: #5682AD;
background: #57A75E;
line-height: 1.5em;
padding: .75em 0;
color: #ffffff;
Expand Down Expand Up @@ -343,7 +343,7 @@ div.document
position: relative;
margin: 0 auto;
max-width: 11.5in;
background: #F2F2F2;
background: #ededed;


}
Expand Down Expand Up @@ -389,16 +389,16 @@ div.body


background-color: #f8f8f8;
border-left: 1px solid rgba(0,0,0,.05);
border-left: 1px solid rgba(0,0,0,.15);




-moz-box-shadow: -1px 0 2px rgba(0,0,0,.05);
-webkit-box-shadow: -1px 0 2px rgba(0,0,0,.05);
-o-box-shadow: -1px 0 2px rgba(0,0,0,.05);
-ms-box-shadow: -1px 0 2px rgba(0,0,0,.05);
box-shadow: -1px 0 2px rgba(0,0,0,.05);
-moz-box-shadow: -1px 0 2px rgba(0,0,0,.15);
-webkit-box-shadow: -1px 0 2px rgba(0,0,0,.15);
-o-box-shadow: -1px 0 2px rgba(0,0,0,.15);
-ms-box-shadow: -1px 0 2px rgba(0,0,0,.15);
box-shadow: -1px 0 2px rgba(0,0,0,.15);



Expand Down Expand Up @@ -504,7 +504,7 @@ div.sphinxsidebar ul

div.sphinxsidebar a
{
color: #003469;
color: #006906;
border: 1px solid transparent;
border-width: 1px 0;
}
Expand Down Expand Up @@ -872,7 +872,7 @@ button#sidebar-hide


background: transparent;
border: 1px solid rgba(0,0,0,.05);
border: 1px solid rgba(0,0,0,.15);

border-top-width: 0;

Expand Down Expand Up @@ -1579,7 +1579,7 @@ table.docutils th + .double-left-divider { border-left-width: 0; }

div.admonition, p.deprecated
{
background: #E7F0FE;
background: #D9E4F1;



Expand Down Expand Up @@ -1618,13 +1618,13 @@ div.admonition, p.deprecated



div.caution, div.important { background-color: #FFF7E0; background-image: url("icon-caution.png"); }
div.warning { background-color: #ffe4e4; background-image: url("icon-warning.png"); }
div.danger, div.admonition.error { background-color: #ffe4e4; background-image: url("icon-danger.png"); }
div.caution, div.important { background-color: #eeeeee; background-image: url("icon-caution.png"); }
div.warning { background-color: #EBC5A7; background-image: url("icon-warning.png"); }
div.danger, div.admonition.error { background-color: #EBC5A7; background-image: url("icon-danger.png"); }

div.seealso { background-color: #FFF7E0; background-image: url("icon-seealso.png"); }
div.admonition-todo { background-color: #FFF7E0; background-image: url("icon-todo.png"); }
p.deprecated { background-color: #fbece0; background-image: url("icon-deprecated.png"); }
div.seealso { background-color: #eeeeee; background-image: url("icon-seealso.png"); }
div.admonition-todo { background-color: #eeeeee; background-image: url("icon-todo.png"); }
p.deprecated { background-color: #ffebab; background-image: url("icon-deprecated.png"); }


div.admonition p,
Expand Down Expand Up @@ -1790,9 +1790,9 @@ td.linenos pre

div.highlight pre
{
background-color: #eeffcc;
background-color: #e8ffe6;

border: 1px solid #AACC99;
border: 1px solid #129100;
border-width: 1px 0;
border-style: solid dotted dotted solid;

Expand Down Expand Up @@ -1851,8 +1851,8 @@ code

code.literal
{
background-color: rgba(0,0,0,.075);
border: 1px solid rgba(0,0,0,.05);
background-color: rgba(0,0,0,.06);
border: 1px solid transparent;
padding: 0px 4px;
margin: 1px;

Expand Down Expand Up @@ -2059,7 +2059,7 @@ div.viewcode-block:target
dl.attribute > dt
{
background-color:
#e6e6e6;
#ffd5ff;
}
dl.function > dt,
Expand All @@ -2068,20 +2068,20 @@ div.viewcode-block:target
dl.staticmethod > dt
{
background-color:
#deebf5;
#eefbff;
}
dl.class > dt
{
background-color:
#eee3ce;
#fff3df;
border-width: 0 0 0 6px;
}
dl.exception > dt
{
background-color:
#eee3ce;
#e9ffd0;
}
Expand Down Expand Up @@ -2149,7 +2149,7 @@ table.indextable span.category
{
font-size: 80%;
font-style: italic;
color: #84ADBE;
color: #999999;
}

table.indextable a,
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ <h2>Contents<a class="headerlink" href="#contents" title="Permalink to this head
<li class="toctree-l2"><a class="reference internal" href="readme.html#matlab-toolbox">Matlab Toolbox</a></li>
<li class="toctree-l2"><a class="reference internal" href="readme.html#c-usage">C++ Usage</a></li>
<li class="toctree-l2"><a class="reference internal" href="readme.html#compile-and-tests">Compile and tests</a></li>
<li class="toctree-l2"><a class="reference internal" href="readme.html#online-documentation">Online Documentation</a></li>
<li class="toctree-l2"><a class="reference internal" href="readme.html#documentation-and-home">Documentation and home</a></li>
<li class="toctree-l2"><a class="reference internal" href="readme.html#developer">Developer</a></li>
<li class="toctree-l2"><a class="reference internal" href="readme.html#references">References</a></li>
<li class="toctree-l2"><a class="reference internal" href="readme.html#license">License</a></li>
Expand Down
Binary file modified docs/objects.inv
Binary file not shown.
11 changes: 7 additions & 4 deletions docs/readme.html
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,13 @@ <h2>Compile and tests<a class="headerlink" href="#compile-and-tests" title="Perm
</pre></div>
</div>
</div>
<div class="section" id="online-documentation">
<h2>Online Documentation<a class="headerlink" href="#online-documentation" title="Permalink to this headline"></a>
<div class="section" id="documentation-and-home">
<h2>Documentation and home<a class="headerlink" href="#documentation-and-home" title="Permalink to this headline"></a>
</h2>
<p>Available at: <a class="reference external" href="http://ebertolazzi.github.io/Splines">http://ebertolazzi.github.io/Splines</a></p>
<ul class="simple">
<li><p><a class="reference external" href="http://ebertolazzi.github.io/Splines">http://ebertolazzi.github.io/Splines</a></p></li>
<li><p><a class="reference external" href="https://github.com/ebertolazzi/Splines">https://github.com/ebertolazzi/Splines</a></p></li>
</ul>
</div>
<div class="section" id="developer">
<h2>Developer<a class="headerlink" href="#developer" title="Permalink to this headline"></a>
Expand Down Expand Up @@ -266,7 +269,7 @@ <h3><a href="index.html">Page contents</a></h3>
<li><a class="reference internal" href="#matlab-toolbox">Matlab Toolbox</a></li>
<li><a class="reference internal" href="#c-usage">C++ Usage</a></li>
<li><a class="reference internal" href="#compile-and-tests">Compile and tests</a></li>
<li><a class="reference internal" href="#online-documentation">Online Documentation</a></li>
<li><a class="reference internal" href="#documentation-and-home">Documentation and home</a></li>
<li><a class="reference internal" href="#developer">Developer</a></li>
<li><a class="reference internal" href="#references">References</a></li>
<li><a class="reference internal" href="#license">License</a></li>
Expand Down
2 changes: 1 addition & 1 deletion docs/searchindex.js

Large diffs are not rendered by default.

Loading

0 comments on commit d87f127

Please sign in to comment.