Timestamp:
Apr 26, 2010, 4:35:42 PM (16 years ago)
Author:
Frederik Heber <heber@…>
Children:
326a42d
Parents:
732da7 (diff), 8758eb (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.
Message:

Merge branch 'FixWorld_differentdefaultcell_size' into Analysis_PairCorrelation

Conflicts:

molecuilder/src/World.cpp

Conflict has been due to added cell_size initialization.

(No files)

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