Regressionstest
..
metadata
.
Branch test
Test Stand 5.5.13
Merge branch 'NilÃ¼fer'

Conflicts:
	.metadata/.log
	.metadata/.plugins/com.qnx.tools.ide.qde.core/qdeBuildInfo
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.cdt.core/SE2P.1367223444528.pdom
	.metadata/.plugins/org.eclipse.core.resources/.projects/SE2P/.indexes/3c/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SE2P/.indexes/3c/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SE2P/.indexes/75/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SE2P/.indexes/d8/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SE2P/.indexes/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SE2P/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SE2P/.markers
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2013/5/18/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2013/5/18/refactorings.index
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/SE2P/2013/5/18/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/SE2P/2013/5/18/refactorings.index
	.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	SE2P/Regressionstest/Regressionstest.cpp
	SE2P/Regressionstest/Regressionstest.h
	SE2P/Regressionstest/Regressionstest_Aktorik.cpp
	SE2P/common.mk
	SE2P/main.cpp
Regressionstest Stand 6.5.2013
Merge branch 'NilÃ¼fer'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/SE2P/.indexes/3c/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SE2P/.indexes/75/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SE2P/.indexes/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SE2P/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SE2P/.markers
	.metadata/.plugins/org.eclipse.core.resources/.root/17.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.qnx.tools.ide.qde.core.prefs
	.metadata/.plugins/org.eclipse.debug.core/.launches/SE2P (1).launch
	.metadata/.plugins/org.eclipse.debug.core/.launches/SE2P.launch
	.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	SE2P/Regressionstest/Regressionstest.cpp
	SE2P/common.mk
commit to merge
.
.metadata
Merge branch 'NilÃ¼fer'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/SE2P/.markers
	.metadata/.plugins/org.eclipse.core.resources/.root/17.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	SE2P/x86/o-g/HAL_A.o
	SE2P/x86/o-g/HAL_A_bar.o
	SE2P/x86/o-g/HAL_A_conveyor.o
	SE2P/x86/o-g/HAL_A_led.o
	SE2P/x86/o-g/HAL_A_light.o
	SE2P/x86/o-g/HAL_S.o
	SE2P/x86/o-g/HAL_S_interrupt.o
	SE2P/x86/o-g/HAWThread.o
	SE2P/x86/o-g/Mutex.o
	SE2P/x86/o-g/RS232_1.o
	SE2P/x86/o-g/RS232_2.o
	SE2P/x86/o-g/Regressionstest.o
	SE2P/x86/o-g/SE2P_g
	SE2P/x86/o-g/main.o
	SE2P/x86/o/HAL_A_led.o
	SE2P/x86/o/HAL_S.o
	SE2P/x86/o/HAL_S_interrupt.o
	SE2P/x86/o/Regressionstest.o
	SE2P/x86/o/SE2P
	SE2P/x86/o/main.o