|
Last change
on this file since 669a7e was e08f45, checked in by Frederik Heber <heber@…>, 17 years ago |
|
Merge branch 'ConcaveHull' of ../espack2 into ConcaveHull
Conflicts:
molecuilder/src/boundary.cpp
molecuilder/src/boundary.hpp
molecuilder/src/builder.cpp
molecuilder/src/linkedcell.cpp
molecuilder/src/linkedcell.hpp
molecuilder/src/vector.cpp
molecuilder/src/vector.hpp
util/src/NanoCreator.c
Basically, this resulted from a lot of conversions two from spaces to one tab, which is my standard indentation. The mess was caused by eclipse auto-indenting. And in espack2:ConcaveHull was the new stuff, so all from ConcaveHull was replaced in case of doubt.
Additionally, vector had ofstream << operator instead ostream << ...
|
-
Property mode
set to
100755
|
|
File size:
913 bytes
|
| Line | |
|---|
| 1 | SOURCE = atom.cpp bond.cpp boundary.cpp builder.cpp config.cpp element.cpp ellipsoid.cpp helpers.cpp molecules.cpp linkedcell.cpp moleculelist.cpp parser.cpp periodentafel.cpp vector.cpp verbose.cpp
|
|---|
| 2 | HEADER = boundary.hpp defs.hpp ellipsoid.hpp helpers.hpp linkedcell.hpp molecules.hpp parser.hpp periodentafel.hpp stackclass.hpp vector.hpp
|
|---|
| 3 |
|
|---|
| 4 | bin_PROGRAMS = molecuilder joiner analyzer
|
|---|
| 5 | molecuilderdir = ${bindir}
|
|---|
| 6 | molecuilder_DATA = elements.db valence.db orbitals.db Hbonddistance.db Hbondangle.db
|
|---|
| 7 | molecuilder_SOURCES = ${SOURCE} ${HEADER}
|
|---|
| 8 | joiner_SOURCES = joiner.cpp datacreator.cpp element.cpp helpers.cpp periodentafel.cpp parser.cpp verbose.cpp datacreator.hpp helpers.hpp parser.hpp periodentafel.hpp
|
|---|
| 9 | analyzer_SOURCES = analyzer.cpp datacreator.cpp element.cpp helpers.cpp periodentafel.cpp parser.cpp verbose.cpp helpers.hpp periodentafel.hpp parser.hpp datacreator.hpp
|
|---|
| 10 |
|
|---|
| 11 |
|
|---|
| 12 | #EXTRA_DIST = ${molecuilder_DATA}
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
