|
Last change
on this file since 3b470f was 3b470f, checked in by Frederik Heber <heber@…>, 16 years ago |
|
Merge branch 'Thermostat'
Conflicts:
.gitignore
Makefile.am
molecuilder/src/analyzer.cpp
molecuilder/src/builder.cpp
molecuilder/src/config.cpp
molecuilder/src/moleculelist.cpp
molecuilder/src/molecules.cpp
molecuilder/src/molecules.hpp
- config::SaveMPQC() has different call parameters
- analyzer and joiner had conflicts due to Chi and ChiPAS values
- molecule::VerletForceIntegration() is slightly different too, but Thermostat supposedly is old version
|
-
Property mode
set to
100755
|
|
File size:
315 bytes
|
| Line | |
|---|
| 1 | # exclude some dirs
|
|---|
| 2 | build*
|
|---|
| 3 | bin
|
|---|
| 4 | tests
|
|---|
| 5 |
|
|---|
| 6 | # exclude generated html
|
|---|
| 7 | *html*
|
|---|
| 8 |
|
|---|
| 9 | # exclude Eclipse files
|
|---|
| 10 | .cdtproject
|
|---|
| 11 | .cproject
|
|---|
| 12 | .project
|
|---|
| 13 | .settings
|
|---|
| 14 |
|
|---|
| 15 |
|
|---|
| 16 | # exclude automake generated stuff
|
|---|
| 17 | *.in
|
|---|
| 18 | *.in~
|
|---|
| 19 | *.swp
|
|---|
| 20 | *.bak
|
|---|
| 21 | configure
|
|---|
| 22 | config
|
|---|
| 23 | aclocal.m4
|
|---|
| 24 | autom4te.cache
|
|---|
| 25 | missing
|
|---|
| 26 | INSTALL
|
|---|
| 27 | COPYING
|
|---|
| 28 |
|
|---|
| 29 | # exclude archives
|
|---|
| 30 | *.tgz
|
|---|
| 31 | *.tar.gz
|
|---|
| 32 | *.bgz
|
|---|
| 33 | *.tar.bz2
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
