Merge branch 'master' into measuring

 Conflicts:
	conf.py
	scripts/configurations.py

1 files changed, 4 insertions, 0 deletions

diff --git a/conf.py b/conf.py
index 31f343a..fd905b0 100644
--- a/conf.py
+++ b/conf.py
@@ -35,6 +35,10 @@ parse_command = ['./parse_script']
 # Identifier of measurement can consist of measure tool name and version
 measure_identifier = 'cyclictest-v0.92'
 
+# measurement_identifier
+# Identifier of measurement can consist of measure tool name and version
+measure_identifier = 'cyclictest-v0.92'
+
 # picosat_args
 # Additional arguments passed to PicoSAT.
 picosat_args = []