|
Last change
on this file since 057b77 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:
458 bytes
|
| Rev | Line | |
|---|
| [a0bcf1] | 1 | # -*- Autoconf -*-
|
|---|
| 2 | # Process this file with autoconf to produce a configure script.
|
|---|
| 3 |
|
|---|
| 4 | AC_PREREQ(2.59)
|
|---|
| 5 | AC_INIT([ElectronicStructurePACKage], 1.1, heber@ins.uni-bonn.de, ESPACK)
|
|---|
| 6 | AC_CONFIG_AUX_DIR([config])
|
|---|
| 7 | AC_CONFIG_SRCDIR([pcp/src/pcp.c])
|
|---|
| 8 | AC_CONFIG_HEADER([config.h])
|
|---|
| 9 |
|
|---|
| 10 | AM_INIT_AUTOMAKE(dist-bzip2)
|
|---|
| 11 |
|
|---|
| 12 | AC_CANONICAL_HOST
|
|---|
| 13 |
|
|---|
| 14 | AC_CONFIG_FILES([Makefile])
|
|---|
| 15 | AC_CONFIG_SUBDIRS([pcp util molecuilder])
|
|---|
| 16 | AC_OUTPUT
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
