merge

2014-04-11 12:26:43 +02:00
parent 53d37036bc 569949cfa6
commit d313afa84a
32 changed files with 513 additions and 240 deletions
--- a/dram/src/simulation/main.cpp
+++ b/dram/src/simulation/main.cpp
@@ -73,6 +73,7 @@ bool batchSetups(pair<string, string> tracePair, vector<DramSetup> setups)
 int sc_main(int argc, char **argv)
 {
 	sc_set_time_resolution(1, SC_PS);
+	

 	resources = pathOfFile(argv[0]) + string("/../resources/");