Automated Merge Preparation

This commit is contained in:
Jan Schuffenhauer
2020-01-17 10:00:04 +01:00
parent 065455dd51
commit 579e9028e0
16 changed files with 897 additions and 908 deletions

View File

@@ -140,7 +140,7 @@ Protected Member Functions</h2></td></tr>
<p>The <a class="el" href="class_intelli_photo_gui.html" title="The IntelliPhotoGui base class handles the graphical user interface and events for the intelliPhoto p...">IntelliPhotoGui</a> method is the constructor and is used to create a new instance of the main program window. </p>
<p class="definition">Definition at line <a class="el" href="_intelli_photo_gui_8cpp_source.html#l00007">7</a> of file <a class="el" href="_intelli_photo_gui_8cpp_source.html">IntelliPhotoGui.cpp</a>.</p>
<p class="definition">Definition at line <a class="el" href="_intelli_photo_gui_8cpp_source.html#l00010">10</a> of file <a class="el" href="_intelli_photo_gui_8cpp_source.html">IntelliPhotoGui.cpp</a>.</p>
</div>
</div>
@@ -171,7 +171,7 @@ Protected Member Functions</h2></td></tr>
<p>The closeEvent function handles closing events. </p>
<p class="definition">Definition at line <a class="el" href="_intelli_photo_gui_8cpp_source.html#l00023">23</a> of file <a class="el" href="_intelli_photo_gui_8cpp_source.html">IntelliPhotoGui.cpp</a>.</p>
<p class="definition">Definition at line <a class="el" href="_intelli_photo_gui_8cpp_source.html#l00026">26</a> of file <a class="el" href="_intelli_photo_gui_8cpp_source.html">IntelliPhotoGui.cpp</a>.</p>
</div>
</div>
@@ -191,7 +191,7 @@ Protected Member Functions</h2></td></tr>
</table>
</div><div class="memdoc">
<p class="definition">Definition at line <a class="el" href="_intelli_photo_gui_8cpp_source.html#l00827">827</a> of file <a class="el" href="_intelli_photo_gui_8cpp_source.html">IntelliPhotoGui.cpp</a>.</p>
<p class="definition">Definition at line <a class="el" href="_intelli_photo_gui_8cpp_source.html#l00828">828</a> of file <a class="el" href="_intelli_photo_gui_8cpp_source.html">IntelliPhotoGui.cpp</a>.</p>
</div>
</div>
@@ -210,7 +210,7 @@ Protected Member Functions</h2></td></tr>
</table>
</div><div class="memdoc">
<p class="definition">Definition at line <a class="el" href="_intelli_photo_gui_8cpp_source.html#l00836">836</a> of file <a class="el" href="_intelli_photo_gui_8cpp_source.html">IntelliPhotoGui.cpp</a>.</p>
<p class="definition">Definition at line <a class="el" href="_intelli_photo_gui_8cpp_source.html#l00837">837</a> of file <a class="el" href="_intelli_photo_gui_8cpp_source.html">IntelliPhotoGui.cpp</a>.</p>
</div>
</div>