Matthias Jung a2c757e347 Merge branch 'master' of git.rhrk.uni-kl.de:EIT-Wehn/dram.vp.system ...

Conflicts:
	dram/dramSys/dramSys.pro
	dram/resources/scripts/metrics.py
	dram/src/common/libDRAMPower.cpp

2014-07-15 11:56:09 +02:00

..

dramSys

Merge branch 'master' of git.rhrk.uni-kl.de:EIT-Wehn/dram.vp.system

2014-07-15 11:56:09 +02:00

resources

Preparing for DRAMPower Library

2014-07-15 11:36:01 +02:00

src

Merge branch 'master' of git.rhrk.uni-kl.de:EIT-Wehn/dram.vp.system

2014-07-15 11:56:09 +02:00

clean

refresh manager changed vector to map

2014-04-10 10:22:16 +02:00