Timestamp:
Nov 4, 2009, 6:25:42 PM (16 years ago)
Author:
Frederik Heber <heber@…>
Children:
543ce4
Parents:
5f1d021 (diff), 96d8dc (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 'CodeRefactoring' of ​ssh://adamantium/home/metzler/workspace/espack into Analysis_PairCorrelation

Conflicts:

molecuilder/src/unittests/Makefile.am

  • molecuilder/src/Makefile.am: included log.cpp, logger.cpp and errorlogger.cpp un libmolecuilder
  • molecuilder/src/unittests/Makefile.am: included LogUnitTest in tests and removed CXXFLAGS and LDFLAGS from it
File:
1 added

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