Ignore:
Timestamp:
Oct 9, 2009, 12:30:54 PM (16 years ago)
Author:
Frederik Heber <heber@…>
Children:
104cf4
Parents:
3efb4a (diff), 682229 (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.
git-author:
Frederik Heber <heber@…> (10/09/09 12:18:41)
git-committer:
Frederik Heber <heber@…> (10/09/09 12:30:54)
Message:

Merge branch 'new-delete-conversion' into CodeRefactoring

Conflicts:

molecuilder/src/Makefile.am
molecuilder/src/helpers.cpp
molecuilder/src/helpers.hpp
molecuilder/src/memoryusageobserver.cpp

  • FIX: performCriticalExit() was declared static but not defined a such.
  • Merge was basically only due to libmolecuilder which was not used in CodeRefactoring branch before.
  • added ActOnAll Unit test to new unittests sub folder and to Makefile.am
File:
1 edited

Legend:

Unmodified
Added
Removed
  • molecuilder/src/helpers.hpp

    r3efb4a re71890  
    5050int CompareDoubles (const void * a, const void * b);
    5151double * ReturnFullMatrixforSymmetric(double *cell_size);
     52static void performCriticalExit();
    5253
    5354/********************************************** helpful template functions *********************************/
Note: See TracChangeset for help on using the changeset viewer.