Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.cproject
This commit is contained in:
2017-09-20 21:30:24 +02:00
3 changed files with 16 additions and 5 deletions

View File

@ -1,6 +1,3 @@
eclipse.preferences.version=1
environment/project/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/SYSTEMC_HOME/delimiter=\:
environment/project/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/SYSTEMC_HOME/operation=replace
environment/project/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/SYSTEMC_HOME/value=/usr/local
environment/project/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/append=true
environment/project/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/appendContributed=true