Ignore:
Timestamp:
Oct 5, 2009, 4:05:53 PM (16 years ago)
Author:
Frederik Heber <heber@…>
Children:
58808e
Parents:
e1f6d7 (diff), bf497f (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 'ConcaveHull' into ConvexHull

Conflicts:

.gitignore
molecuilder/src/Makefile.am
molecuilder/src/atom.cpp
molecuilder/src/tesselation.cpp

no serious overlaps, just a free Frees that were not present in ConcaveHull were MemoryAllocator class was added.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • molecuilder/src/molecules.hpp

    re1f6d7 r8afe31  
    207207
    208208  molecule *CopyMolecule();
     209  molecule* CopyMoleculeFromSubRegion(Vector offset, double *parallelepiped);
    209210
    210211  /// Fragment molecule by two different approaches:
Note: See TracChangeset for help on using the changeset viewer.