Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw_example_public into mueller/master

This commit is contained in:
Robin Müller 2021-05-17 13:28:58 +02:00
commit acee256b1c
2 changed files with 3 additions and 3 deletions

2
fsfw

@ -1 +1 @@
Subproject commit f3530d3c7ede036e02a65963fcf36da4e5dc024a
Subproject commit b06113993c4952532c39b8adbcabf2a630457a5e

View File

@ -18,11 +18,11 @@
<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build-Debug-Linux/fsfw_example"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="fsfw_example"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="fsfw_example_public"/>
<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.toolchain.gnu.base.450259316.1933681494"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/fsfw_example"/>
<listEntry value="/fsfw_example_public"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>