|
Last change
on this file since af20f3 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:
204 bytes
|
| Line | |
|---|
| 1 | 1 0.74 -1 -1
|
|---|
| 2 | 2 0.77429209 -1 -1
|
|---|
| 3 | 5 1.23 1.19 1.18
|
|---|
| 4 | 6 1.09 1.076 1.06
|
|---|
| 5 | 7 1.04 1.02 1.01
|
|---|
| 6 | 8 0.96 0.957 -1
|
|---|
| 7 | 14 1.48 1.48 1.48
|
|---|
| 8 | 15 1.42 -1 -1
|
|---|
| 9 | 16 1.35 -1 -1
|
|---|
| 10 | 17 1.29 -1 -1
|
|---|
| 11 | 20 1.09 1.09 -1
|
|---|
| 12 | 34 1.47 -1 -1
|
|---|
| 13 | 35 1.44 -1 -1
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
