Changeset [647754ed0d6e79cd1fbcea6cc45d01ecfe6a7edd] by Christopher Stawarz
Revision 647754ed0d6e79cd1fbcea6cc45d01ecfe6a7edd,
committed by Christopher Stawarz
· April 25th, 2011 @ 02:40 PM
Merge branch 'master' into smarter_components
https://github.com/mworks-project/mw_core/commit/647754ed0d6e79cd1f...
11 changed files
-
R
Core/ParadigmComponents/CancelScheduledActionsAction.cpp -
R
Core/ParadigmComponents/CancelScheduledActionsAction.h -
M
Core/ComponentRegistries/ComponentRegistry.cpp -
M
Core/ExperimentDataLoading/LoadingUtilities.cpp -
M
Core/ParadigmComponents/PulseAction.cpp -
M
Core/ParadigmComponents/ScheduledActions.cpp -
M
Core/ParadigmComponents/ScheduledActions.h -
M
Core/ParadigmComponents/tests/ActionTest.cpp -
M
Core/ParadigmComponents/tests/ActionTest.h -
M
Core/XMLParser/XMLParser.cpp -
M
MWorksCore.xcodeproj/project.pbxproj