From 65d06a34f5f184176253ceff2666273de51ac0e6 2017-07-07 10:00:33
From: mperrinel <mperrinel@itlink.fr>
Date: 2017-07-07 10:00:33
Subject: [PATCH] Merge branch 'feature/ThreadFix' of
https://perrinel@hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation
into feature/ThreadFix

Conflicts:
	core/src/Variable/Variable.cpp
	core/src/Variable/VariableCacheController.cpp
	core/src/Variable/VariableController.cpp
	gui/src/Visualization/VisualizationGraphHelper.cpp
	plugins/mockplugin/src/CosinusProvider.cpp

---