|
Last change
on this file since c20eac 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:
180 bytes
|
| Line | |
|---|
| 1 | 1 180 -1 -1
|
|---|
| 2 | 5 180 131.0 109.2
|
|---|
| 3 | 6 180 120 109.47
|
|---|
| 4 | 7 180 110 106.67
|
|---|
| 5 | 8 180 104.5 -1
|
|---|
| 6 | 14 180 120 109.47
|
|---|
| 7 | 15 180 -1 -1
|
|---|
| 8 | 16 180 -1 -1
|
|---|
| 9 | 17 180 -1 -1
|
|---|
| 10 | 20 180 120 109.47
|
|---|
| 11 | 34 180 -1 -1
|
|---|
| 12 | 35 180 -1 -1
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
