# HG changeset patch
# User sugi
# Date 1397632465 -32400
# Node ID dba0d22e15d9892fb6645315fb1f73aaaa5527c1
# Parent  174ea66bf28a0952e8bac14a95fc3ce8180078a1# Parent  a725e90c3a9b92b3e130fe7c0f2cbf05b6fbfcd0
Merge with a725e90c3a9b92b3e130fe7c0f2cbf05b6fbfcd0

diff -r 174ea66bf28a -r dba0d22e15d9 src/alice/codesegment/CodeSegment.java
diff -r 174ea66bf28a -r dba0d22e15d9 src/alice/codesegment/CodeSegmentManager.java
diff -r 174ea66bf28a -r dba0d22e15d9 src/alice/topology/manager/StartTopologyManager.java