Commit Graph

10 Commits

Author SHA1 Message Date
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
ddc53243dd Updated sc-components 2018-04-27 19:39:58 +02:00
1ac5e7f118 Updated CMake settings 2018-04-27 19:35:45 +02:00
2c07784645 Updated Eclipse project config and associated files 2018-03-27 21:53:14 +02:00
ea97fed4a0 Updated sc-components 2018-03-27 20:57:10 +02:00
27b1e268c0 Added CCI to build and support of conan.io 2018-03-27 20:52:14 +02:00
e719dc1118 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	.cproject
2017-09-20 21:30:24 +02:00
Soeren Jung
ab61abf06c systemc settings fixed for indexer and cmake 2017-09-19 19:33:06 +02:00
ac896bad2b examples updated 2017-09-18 07:32:34 +02:00
48d7daf9d9 Initial checkin 2017-09-17 15:06:10 +02:00