# HG changeset patch
# User Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp>
# Date 1492595761 -32400
# Node ID e46d9910640bdd7952f3fb6f3a5fabb11afeb2aa
# Parent  69cdda5364874663ba37d82fafac94223175b5e7# Parent  4df30cbfb04937ca9aa0f617905f930a86a1fa3b
Merge

diff -r 69cdda536487 -r e46d9910640b doc/gears_structure.graffle
Binary file doc/gears_structure.graffle has changed
diff -r 69cdda536487 -r e46d9910640b src/parallel_execution/examples/calc.cbc
--- a/src/parallel_execution/examples/calc.cbc	Tue Apr 18 18:59:36 2017 +0900
+++ b/src/parallel_execution/examples/calc.cbc	Wed Apr 19 18:56:01 2017 +0900
@@ -116,6 +116,7 @@
     task->odg = task->maxIdg;
     task->data[task->odg] = (union Data*)integer3;
     task->maxOdg = task->odg + 1;
+    taskManager->task = task;
     taskManager->next = C_createTask3;
     taskManager->data = (union Data*)integer1;
     goto meta(context, taskManager->taskManager->TaskManager.setWaitTask);