Felipe S. Prado 8362e34bd2 Conflicts resolved

2016-10-21 15:29:38 +02:00

..

memUtil.py

Rename memconfig to mcconfig

2016-10-21 15:15:50 +02:00

metrics.py

Rename memconfig to mcconfig

2016-10-21 15:15:50 +02:00

plots.py

Informative message added.

2016-10-18 16:30:31 +02:00

scripts.pri

QTCreator project improved.

2016-04-14 11:41:14 +02:00

tests.py

Rename memconfig to mcconfig

2016-10-21 15:15:50 +02:00