Timestamp:
Apr 26, 2010, 3:47:54 PM (16 years ago)
Author:
Frederik Heber <heber@…>
Children:
bb50e0
Parents:
d2390d (diff), aa8542 (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 'FixBondGraphUnitTest_hydrogencarbon' into Analysis_PairCorrelation

Conflicts:

molecuilder/src/molecule_graph.cpp

There have been conflicts due to LinkedNodes now being local in context LinkedCell.

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

(No files)

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