Timestamp:
Jan 30, 2015, 10:34:16 AM (10 years ago)
Author:
Frederik Heber <heber@…>
Children:
419fa2
Parents:
eea0bb (diff), fff8fc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Frederik Heber <heber@…> (01/29/15 07:42:59)
git-committer:
Frederik Heber <heber@…> (01/30/15 10:34:16)
Message:

Merge branch 'ThreadFixes' into Candidate_v1.4.10

Conflicts:

src/Actions/ActionQueue.cpp
src/Actions/ActionQueue.hpp

  • many conflicts due to last commit in ThreadFixes. Combined stuff from ThreadFixes and preventing failing actions from clearing queue entirely.
(No files)

Note: See TracChangeset for help on using the changeset viewer.