|
Last change
on this file since 4dca8e 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:
331 bytes
|
| Rev | Line | |
|---|
| [a0bcf1] | 1 | EXTRA_DIST = \
|
|---|
| 2 | Doxyfile \
|
|---|
| 3 | html
|
|---|
| 4 |
|
|---|
| 5 | SUFFIXES = .pdf .ps .dvi .tex .xml .html
|
|---|
| 6 |
|
|---|
| 7 | html-local: doxygen-docs
|
|---|
| 8 |
|
|---|
| 9 | doxygen-docs:
|
|---|
| 10 | cd $(srcdir) && $(DOXYGEN)
|
|---|
| 11 |
|
|---|
| 12 |
|
|---|
| 13 | clean-local:
|
|---|
| 14 | rm -f *.aux *.bbl *.blg *.log *.aux.bak
|
|---|
| 15 | distclean-local:
|
|---|
| 16 | rm -f *.dvi *.ps *.pdf *.html $(GENMANDOCS) manpages.stamp
|
|---|
| 17 |
|
|---|
| 18 | .PHONY: allclean doxygen-docs
|
|---|
| 19 | allclean: distclean
|
|---|
| 20 |
|
|---|
| 21 |
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
