Commit 31d000c3 authored by Dmitri Fix's avatar Dmitri Fix
Browse files

Merge remote-tracking branch 'remotes/origin/servant'

parents 9e1daeda 9ce30427
......@@ -4,3 +4,4 @@ Thumbs.db
*.orig
*.rej
*.user
deps/
\ No newline at end of file
<doxygenlayout version="1.0">
<!--
/*********************************************************************
* This Example Content is intended to demonstrate usage of
* Eclipse technology. It is provided to you under the terms
* and conditions of the Eclipse Distribution License v1.0
* which is available at http://www.eclipse.org/org/documents/edl-v10.php
**********************************************************************/
-->
<navindex>
<tab type="mainpage" visible="yes" title="Main"/>
<tab type="pages" visible="no" title="" intro=""/>
<tab type="modules" visible="yes" title="Modules" intro=""/>
<tab type="namespaces" visible="no" title="">
<tab type="namespacelist" visible="no" title="" intro=""/>
<tab type="namespacemembers" visible="no" title="" intro=""/>
</tab>
<tab type="classes" visible="yes" title="Classes">
<tab type="classlist" visible="no" title="" intro=""/>
<tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
<tab type="hierarchy" visible="yes" title="" intro=""/>
<tab type="classmembers" visible="yes" title="" intro=""/>
</tab>
<tab type="files" visible="no" title="">
<tab type="filelist" visible="no" title="" intro=""/>
<tab type="globals" visible="no" title="" intro=""/>
</tab>
<tab type="examples" visible="no" title="" intro=""/>
</navindex>
<!-- Layout definition for a class page -->
<class>
<detaileddescription title=""/>
<briefdescription visible="yes"/>
<includes visible="$SHOW_INCLUDE_FILES"/>
<inheritancegraph visible="$CLASS_GRAPH"/>
<collaborationgraph visible="$COLLABORATION_GRAPH"/>
<memberdecl>
<nestedclasses visible="yes" title=""/>
<publictypes title=""/>
<services title=""/>
<interfaces title=""/>
<publicslots title=""/>
<signals title=""/>
<publicmethods title=""/>
<publicstaticmethods title=""/>
<publicattributes title=""/>
<publicstaticattributes title=""/>
<protectedtypes title=""/>
<protectedslots title=""/>
<protectedmethods title=""/>
<protectedstaticmethods title=""/>
<protectedattributes title=""/>
<protectedstaticattributes title=""/>
<packagetypes title=""/>
<packagemethods title=""/>
<packagestaticmethods title=""/>
<packageattributes title=""/>
<packagestaticattributes title=""/>
<properties title=""/>
<events title=""/>
<privatetypes title=""/>
<privateslots title=""/>
<privatemethods title=""/>
<privatestaticmethods title=""/>
<privateattributes title=""/>
<privatestaticattributes title=""/>
<friends title=""/>
<related title="" subtitle=""/>
<membergroups visible="yes"/>
</memberdecl>
<memberdef>
<inlineclasses title=""/>
<typedefs title=""/>
<enums title=""/>
<services title=""/>
<interfaces title=""/>
<constructors title=""/>
<functions title=""/>
<related title=""/>
<variables title=""/>
<properties title=""/>
<events title=""/>
</memberdef>
<allmemberslink visible="yes"/>
<usedfiles visible="$SHOW_USED_FILES"/>
<authorsection visible="yes"/>
</class>
<!-- Layout definition for a group page -->
<group>
<briefdescription visible="no"/>
<detaileddescription title=""/>
<groupgraph visible="$GROUP_GRAPHS"/>
<memberdecl>
<nestedgroups visible="yes" title=""/>
<dirs visible="yes" title=""/>
<files visible="yes" title=""/>
<namespaces visible="yes" title=""/>
<classes visible="yes" title=""/>
<defines title=""/>
<typedefs title=""/>
<enums title=""/>
<enumvalues title=""/>
<functions title=""/>
<variables title=""/>
<signals title=""/>
<publicslots title=""/>
<protectedslots title=""/>
<privateslots title=""/>
<events title=""/>
<properties title=""/>
<friends title=""/>
<membergroups visible="yes"/>
</memberdecl>
<memberdef>
<pagedocs/>
<inlineclasses title=""/>
<defines title=""/>
<typedefs title=""/>
<enums title=""/>
<enumvalues title=""/>
<functions title=""/>
<variables title=""/>
<signals title=""/>
<publicslots title=""/>
<protectedslots title=""/>
<privateslots title=""/>
<events title=""/>
<properties title=""/>
<friends title=""/>
</memberdef>
<authorsection visible="yes"/>
</group>
</doxygenlayout>
/*********************************************************************
* This Example Content is intended to demonstrate usage of
* Eclipse technology. It is provided to you under the terms
* and conditions of the Eclipse Distribution License v1.0
* which is available at http://www.eclipse.org/org/documents/edl-v10.php
**********************************************************************/
/** \addtogroup [...]
* @{
* [...]
*
* \section inputs Inputs
* name | meaning
* -----|---------
* [...] | [...]
* none
*
* \section outputs Outputs
* name | meaning
* -----|---------
* [...] | [...]
* none
*
* \section configParameters Parameters to be specified in agentConfiguration.xml
* type | id | meaning | corresponding external paramter
* -----|----|---------|----------------------------------
* none
*
* @} */
/**
* \addtogroup [...]
* @{
* @name Inputs
* @{*/
//! [input_description]
[input definition]
/** @} @} */
//-----------------------
/**
* \addtogroup [...]
* @{
* @name Outputs
* @{*/
//! [output_description]
[output definition]
/** @} @} */
//-----------------------
/**
* \addtogroup [...]
* @{
* @name External Parameters
* @{*/
//! [param_description]
[param definition]
/** @} @} */
//-----------------------
/**
* \addtogroup [...]
* @{
* @name Internal Parameters
* @{*/
//! [param_description]
[param definition]
/** @} @} */
\ No newline at end of file
/** \addtogroup [...]
* @{
* [...]
*
* \section inputs Inputs
* name | meaning
* -----|---------
* [...] | [...]
* none
*
* \section outputs Outputs
* name | meaning
* -----|---------
* [...] | [...]
* none
*
* \section configParameters Parameters to be specified in agentConfiguration.xml
* type | id | meaning | corresponding external paramter
* -----|----|---------|----------------------------------
* none
*
* @} */
/**
* \addtogroup [...]
* @{
* @name Inputs
* @{*/
//! [input_description]
[input definition]
/** @} @} */
//-----------------------
/**
* \addtogroup [...]
* @{
* @name Outputs
* @{*/
//! [output_description]
[output definition]
/** @} @} */
//-----------------------
/**
* \addtogroup [...]
* @{
* @name External Parameters
* @{*/
//! [param_description]
[param definition]
/** @} @} */
//-----------------------
/**
* \addtogroup [...]
* @{
* @name Internal Parameters
* @{*/
//! [param_description]
[param definition]
/** @} @} */
\ No newline at end of file
......@@ -652,7 +652,7 @@ FILE_VERSION_FILTER =
# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
# tag is left empty.
LAYOUT_FILE = ../Common/Layout.xml
LAYOUT_FILE = $(DocumentationDir)/Common/Layout.xml
# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
# the reference definitions. This must be a list of .bib files. The .bib
......@@ -1043,7 +1043,7 @@ HTML_FOOTER =
# obsolete.
# This tag requires that the tag GENERATE_HTML is set to YES.
HTML_STYLESHEET = ../Common/customdoxygen.css
HTML_STYLESHEET = $(DocumentationDir)/Common/customdoxygen.css
# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
# cascading style sheets that are included after the standard style sheets
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment