Eyck Jentzsch dc02b44ae1 Merge branch 'master' of ...

https://github.com/Minres/SystemC-Components-Test.git

Conflicts:
	.settings/language.settings.xml
	sc-components

2018-04-27 19:45:16 +02:00

..

language.settings.xml

Merge branch 'master' of

2018-04-27 19:45:16 +02:00

org.eclipse.cdt.core.prefs

Updated Eclipse project config and associated files

2018-03-27 21:53:14 +02:00

org.eclipse.cdt.managedbuilder.core.prefs

Updated CMake settings

2018-04-27 19:35:45 +02:00