Timestamp:
Apr 26, 2010, 4:04:41 PM (16 years ago)
Author:
Frederik Heber <heber@…>
Children:
5a25998
Parents:
d1829c (diff), a3c47c (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 'FixAnalysisCorrelation_zeroinitallbins' into Analysis_PairCorrelation

Conflicts:

molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp

There have been conflicts due to shifted OutputCorrelation() and being commented-out in one commit, not in the other though.

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

(No files)

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