|
Last change
on this file since 99bed3 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:
467 bytes
|
| Line | |
|---|
| 1 | SOURCE = density.c energy.c errors.c excor.c grad.c gramsch.c helpers.c init.c ions.c mergesort2.c myfft.c mymath.c opt.c output.c pcp.c pdbformat.c perturbed.c pseudo.c riemann.c run.c wannier.c
|
|---|
| 2 | HEADER = data.h defs.h density.h energy.h errors.h excor.h grad.h gramsch.h helpers.h init.h ions.h mergesort2.h myfft.h mymath.h opt.h output.h pcp.h pdbformat.h perturbed.h pseudo.h riemann.h run.h wannier.h
|
|---|
| 3 |
|
|---|
| 4 | bin_PROGRAMS = pcp
|
|---|
| 5 | pcp_SOURCES = ${SOURCE} ${HEADER}
|
|---|
| 6 |
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
