Context Navigation

orbitals.db@ ae8b90

Visit:

Last change on this file since ae8b90 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: 442 bytes

Line
1	1 1
2	2 0
3	3 1
4	4 2
5	5 3
6	6 4
7	7 3
8	8 2
9	9 1
10	10 0
11	11 1
12	12 2
13	13 3
14	14 4
15	15 3
16	16 2
17	17 1
18	18 0
19	19 1
20	20 4
21	21 3
22	22 4
23	23 5
24	24 6
25	25 4
26	26 3
27	27 3
28	28 2
29	29 2
30	30 2
31	31 3
32	32 4
33	33 3
34	34 2
35	35 1
36	36 0
37	37 1
38	38 2
39	39 3
40	40 4
41	41 5
42	42 6
43	43 6
44	44 8
45	45 4
46	46 4
47	47 1
48	48 2
49	49 3
50	50 4
51	51 3
52	52 2
53	53 1
54	54 0
55	55 1
56	56 2
57	57 3
58	58 4
59	59 3
60	60 4
61	61 3
62	62 3
63	63 3
64	64 3
65	65 4
66	66 3
67	67 3
68	68 3
69	69 3
70	70 3
71	71 3
72	72 4
73	73 5
74	74 6
75	75 7
76	76 8
77	77 6
78	78 6
79	79 3
80	80 2
81	81 3
82	82 4
83	83 3
84	84 4
85	86 0
86	88 2
87	89 3
88	90 4
89	91 5
90	92 6

Note: See TracBrowser for help on using the repository browser.

Download in other formats:

Original Format