Ignore:
Timestamp:
Jan 26, 2010, 12:45:41 PM (16 years ago)
Author:
Tillmann Crueger <crueger@…>
Children:
d34341
Parents:
931903 (diff), 16807e (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 commit 'heber/Analysis_PairCorrelation' into MenuRefactoring

Conflicts:

Makefile.am
molecuilder/src/Makefile.am
molecuilder/src/builder.cpp
molecuilder/src/unittests/Makefile.am

File:
1 edited

Legend:

Unmodified
Added
Removed

  • molecuilder/src/molecule.hpp

    r931903 r41182a  
    106106
    107107  // re-definition of virtual functions from PointCloud
     108  const char * const GetName() const;
    108109  Vector *GetCenter() const ;
    109110  TesselPoint *GetPoint() const ;
Note: See TracChangeset for help on using the changeset viewer.