Ignore:
Timestamp:
May 8, 2017, 2:00:47 PM (8 years ago)
Author:
Frederik Heber <frederik.heber@…>
Branches:
ForceAnnealing_goodresults, ForceAnnealing_tocheck
Children:
c8165c
Parents:
ce254c (diff), cb6357 (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 'GeometryObjects' into Candidate_v1.6.1

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/UIElements/Qt4/QtMainWindow.hpp

    rce254c r73faf4  
    2727class QtElementList;
    2828class QtFragmentList;
     29class QtGeometryList;
    2930class QtHomologyList;
    3031class QtLogBox;
     
    6061  QtMoleculeList *moleculeList;
    6162  QtElementList *elementList;
     63  QtGeometryList *geometryList;
    6264  QtHomologyList *homologyList;
    6365  QtFragmentList *fragmentList;
Note: See TracChangeset for help on using the changeset viewer.