Changeset [85860a024058462bea5a4a7f28a7be9f3e32b1e6] by Christopher Stawarz
Revision 85860a024058462bea5a4a7f28a7be9f3e32b1e6,
committed by Christopher Stawarz
· March 11th, 2011 @ 02:38 PM
Merge branch 'master' into better_exceptions
https://github.com/mworks-project/mw_core/commit/85860a024058462bea...
16 changed files
-
M
Core/ExperimentDataLoading/ExperimentPackager.cpp -
M
Core/ExperimentDataLoading/ExperimentPackager.h -
M
Core/ExperimentDataLoading/LoadingUtilities.cpp -
M
Core/ExperimentDataLoading/LoadingUtilities.h -
M
Core/RealtimeServices/Utilities.cpp -
M
Core/Stimuli/DynamicStimuli/StandardDynamicStimulus.cpp -
M
Core/Stimuli/DynamicStimuli/StandardDynamicStimulus.h -
M
Core/Stimuli/StandardStimuli.cpp -
M
Core/Stimuli/Stimulus.cpp -
M
Core/Stimuli/Stimulus.h -
M
Core/Variables/VariableLoad.cpp -
M
Core/XMLParser/XMLParser.cpp -
M
Core/XMLParser/XMLParser.h -
M
FreezableVariableContainer.h -
M
UnitTests/MarionetteClient.m -
M
UnitTests/mw_test