|
Last change
on this file since 451d7a 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:
73 bytes
|
| Line | |
|---|
| 1 | ACLOCAL_AMFLAGS = -I m4
|
|---|
| 2 | SUBDIRS = src doc tests
|
|---|
| 3 |
|
|---|
| 4 | EXTRA_DIST = autogen.sh
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
