Ignore:
Timestamp:
Jun 21, 2018, 8:31:25 AM (7 years ago)
Author:
Frederik Heber <frederik.heber@…>
Branches:
Candidate_v1.6.1, ChemicalSpaceEvaluator
Children:
d83d64, f5ea10
Parents:
3e334e (diff), 4fc0ea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'TremoloParser_IncreasedPrecision' into Candidate_v1.6.1

Conflicts:

tests/Python/ForceAnnealing/post/five_carbon_test_bondgraph.data
tests/Python/ForceAnnealing/post/five_carbon_test_no-bondgraph.data

File:
1 edited

Legend:

Unmodified
Added
Removed

  • tests/regression/Parser/Tremolo-SetAtomdata/post/output.data

    r3e334e r8d56a6  
    11# ATOMDATA      Id      type    x=3
    22# Box   20      0       0       0       20      0       0       0       20
    3 1       Ar      4.72977 8       8       
     31       Ar      4.72977074      8       8       
    442       Ar      7.3     8       8       
Note: See TracChangeset for help on using the changeset viewer.