Horst Schirmeier 00f920f487 merge conflict resolved ...

... I somehow missed that one, sorry.

Change-Id: I2daf6f9215f34e39090145ff70e70eaf84d0f286

2013-09-12 09:52:34 +02:00

..

AdvancedMemoryImporter.cc

import-trace: sliding-window AdvancedMemoryImporter

2013-09-10 17:37:26 +02:00

AdvancedMemoryImporter.hpp

import-trace: split into public and protected iface

2013-09-10 17:37:26 +02:00

CMakeLists.txt

import-trace: introduce AdvancedMemoryImporter

2013-09-10 17:37:26 +02:00

Importer.cc

import-trace: add --no-write-ecs switch

2013-09-10 17:43:12 +02:00

Importer.hpp

import-trace: add --no-write-ecs switch

2013-09-10 17:43:12 +02:00

InstructionImporter.cc

import-trace: import extended traces

2013-09-10 17:37:25 +02:00

InstructionImporter.hpp

import-trace: split into public and protected iface

2013-09-10 17:37:26 +02:00

main.cc

import-trace: add --no-write-ecs switch

2013-09-10 17:43:12 +02:00

MemoryImporter.cc

misc cleanups

2013-09-10 17:37:25 +02:00

MemoryImporter.hpp

import-trace: split into public and protected iface

2013-09-10 17:37:26 +02:00

RandomJumpImporter.cc

misc cleanups

2013-09-10 17:37:25 +02:00

RandomJumpImporter.hpp

import-trace: split into public and protected iface

2013-09-10 17:37:26 +02:00

RegisterImporter.cc

merge conflict resolved

2013-09-12 09:52:34 +02:00

RegisterImporter.hpp

Merge commit 'dcd2c021a5ac91d38187d397914e5f51e2fc8819'

2013-09-11 14:38:55 +02:00