Last change
on this file since abd4a1 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:
1.5 KB
|
Line | |
---|
1 | 1 0.10000000000000E+01
|
---|
2 | 2 0.20000000000000E+01
|
---|
3 | 3 0.10000000000000E+01
|
---|
4 | 4 0.20000000000000E+01
|
---|
5 | 5 0.30000000000000E+01
|
---|
6 | 6 0.40000000000000E+01
|
---|
7 | 7 0.50000000000000E+01
|
---|
8 | 8 0.60000000000000E+01
|
---|
9 | 9 0.70000000000000E+01
|
---|
10 | 10 0.80000000000000E+01
|
---|
11 | 11 0.10000000000000E+01
|
---|
12 | 12 0.40000000000000E+01
|
---|
13 | 13 .3000000000000000E+01
|
---|
14 | 14 0.40000000000000E+01
|
---|
15 | 15 0.50000000000000E+01
|
---|
16 | 16 0.60000000000000E+01
|
---|
17 | 17 0.70000000000000E+01
|
---|
18 | 18 0.80000000000000E+01
|
---|
19 | 19 0.30000000000000E+01
|
---|
20 | 20 0.40000000000000E+01
|
---|
21 | 21 0.30000000000000E+01
|
---|
22 | 22 0.40000000000000E+01
|
---|
23 | 23 0.50000000000000E+01
|
---|
24 | 24 0.60000000000000E+01
|
---|
25 | 25 0.70000000000000E+01
|
---|
26 | 26 0.80000000000000E+01
|
---|
27 | 27 0.90000000000000E+01
|
---|
28 | 28 0.10000000000000E+02
|
---|
29 | 29 0.11000000000000E+02
|
---|
30 | 30 0.12000000000000E+02
|
---|
31 | 31 3.00000000000000000
|
---|
32 | 32 0.40000000000000E+01
|
---|
33 | 33 5.00000000000000000
|
---|
34 | 34 0.60000000000000E+01
|
---|
35 | 35 0.70000000000000E+01
|
---|
36 | 36 0.80000000000000E+01
|
---|
37 | 37 0.10000000000000E+01
|
---|
38 | 38 0.20000000000000E+01
|
---|
39 | 39 0.30000000000000E+01
|
---|
40 | 40 0.40000000000000E+01
|
---|
41 | 41 0.50000000000000E+01
|
---|
42 | 42 0.60000000000000E+01
|
---|
43 | 43 0.70000000000000E+01
|
---|
44 | 44 0.80000000000000E+01
|
---|
45 | 45 0.90000000000000E+01
|
---|
46 | 46 0.10000000000000E+02
|
---|
47 | 47 0.11000000000000E+02
|
---|
48 | 48 0.12000000000000E+02
|
---|
49 | 49 0.30000000000000E+01
|
---|
50 | 50 0.40000000000000E+01
|
---|
51 | 51 0.50000000000000E+01
|
---|
52 | 52 0.60000000000000E+01
|
---|
53 | 53 0.70000000000000E+01
|
---|
54 | 54 0.80000000000000E+01
|
---|
55 | 55 0.10000000000000E+01
|
---|
56 | 56 0.20000000000000E+01
|
---|
57 | 72 0.40000000000000E+01
|
---|
58 | 73 0.50000000000000E+01
|
---|
59 | 74 0.60000000000000E+01
|
---|
60 | 75 0.70000000000000E+01
|
---|
61 | 76 0.80000000000000E+01
|
---|
62 | 77 0.90000000000000E+01
|
---|
63 | 78 0.10000000000000E+02
|
---|
64 | 79 0.11000000000000E+02
|
---|
65 | 80 0.12000000000000E+02
|
---|
Note:
See
TracBrowser
for help on using the repository browser.