|
Last change
on this file since 13088d 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:
342 bytes
|
| Line | |
|---|
| 1 | # exclude some dirs
|
|---|
| 2 | build*
|
|---|
| 3 | bin
|
|---|
| 4 | tests
|
|---|
| 5 |
|
|---|
| 6 | # exclude generated html
|
|---|
| 7 | html
|
|---|
| 8 | *.html
|
|---|
| 9 |
|
|---|
| 10 | # exclude Eclipse files
|
|---|
| 11 | .cdt*
|
|---|
| 12 | .cproject
|
|---|
| 13 | .project
|
|---|
| 14 | .settings
|
|---|
| 15 |
|
|---|
| 16 |
|
|---|
| 17 | # exclude automake generated stuff
|
|---|
| 18 | *.in
|
|---|
| 19 | *.in~
|
|---|
| 20 | *.swp
|
|---|
| 21 | *.bak
|
|---|
| 22 | configure
|
|---|
| 23 | config
|
|---|
| 24 | aclocal.m4
|
|---|
| 25 | autom4te.cache
|
|---|
| 26 | missing
|
|---|
| 27 | INSTALL
|
|---|
| 28 | COPYING
|
|---|
| 29 | NEWS
|
|---|
| 30 | AUTHORS
|
|---|
| 31 | CHANGES
|
|---|
| 32 | README
|
|---|
| 33 |
|
|---|
| 34 | # exclude archives
|
|---|
| 35 | *.tgz
|
|---|
| 36 | *.tar.gz
|
|---|
| 37 | *.bgz
|
|---|
| 38 | *.tar.bz2
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
