diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2015-01-11 16:22:59 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2015-01-11 16:22:59 +0100 |
| commit | f0c7612bcd49d32e408e67ac1829ee891c677f7e (patch) | |
| tree | d4cff4aa2d728524b631776ffffee71f42056421 /doc/html/namespaceRedmatrix_1_1Import.html | |
| parent | 43f143a211c75138d09ceb89acc48ea7d5c31ca9 (diff) | |
| parent | 10102ac2ac4d5b02012a9794e23656717ab05556 (diff) | |
| download | volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.tar.gz volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.tar.bz2 volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
doc/html/classRedmatrix_1_1Import_1_1Import-members.html
doc/html/classRedmatrix_1_1Import_1_1Import.js
Diffstat (limited to 'doc/html/namespaceRedmatrix_1_1Import.html')
| -rw-r--r-- | doc/html/namespaceRedmatrix_1_1Import.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/html/namespaceRedmatrix_1_1Import.html b/doc/html/namespaceRedmatrix_1_1Import.html index b21ffdff2..a0ab85227 100644 --- a/doc/html/namespaceRedmatrix_1_1Import.html +++ b/doc/html/namespaceRedmatrix_1_1Import.html @@ -4,7 +4,7 @@ <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/> <meta http-equiv="X-UA-Compatible" content="IE=9"/> <meta name="generator" content="Doxygen 1.8.3.1"/> -<title>The Red Matrix: Redmatrix\Import Namespace Reference</title> +<title>The Red Matrix: RedMatrix\Import Namespace Reference</title> <link href="tabs.css" rel="stylesheet" type="text/css"/> <script type="text/javascript" src="jquery.js"></script> <script type="text/javascript" src="dynsections.js"></script> @@ -85,7 +85,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); </div> </div> <script type="text/javascript"> -$(document).ready(function(){initNavTree('namespaceRedmatrix_1_1Import.html','');}); +$(document).ready(function(){initNavTree('namespaceRedMatrix_1_1Import.html','');}); </script> <div id="doc-content"> <!-- window showing the filter options --> @@ -106,13 +106,13 @@ $(document).ready(function(){initNavTree('namespaceRedmatrix_1_1Import.html','') <div class="summary"> <a href="#nested-classes">Classes</a> </div> <div class="headertitle"> -<div class="title">Redmatrix\Import Namespace Reference</div> </div> +<div class="title">RedMatrix\Import Namespace Reference</div> </div> </div><!--header--> <div class="contents"> <table class="memberdecls"> <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="nested-classes"></a> Classes</h2></td></tr> -<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">class  </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedmatrix_1_1Import_1_1Import.html">Import</a></td></tr> +<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">class  </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">Import</a></td></tr> <tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr> </table> </div><!-- contents --> |