Timestamp:
Mar 3, 2010, 7:17:19 PM (16 years ago)
Author:
Frederik Heber <heber@…>
Children:
296798
Parents:
a83171 (diff), d8fce3 (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 'FixLinkedCellConstructor_Setempytcheck' into Analysis_PairCorrelation

Conflicts:

molecuilder/src/linkedcell.cpp

Conflict was due to changes:

  • set->empty() check prepended by set== NULL
  • cout/cerr -> Log()/eLog()

Signed-off-by: Frederik Heber <heber@…>

(No files)

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