modules/mol/base/src/impl/entity_impl.cc · 13413e6a1f78a3c99ff19012f15a3ec3cfd96445 · schwede / openstructure · GitLab

Snippets Groups Projects

12 years ago
a8ff5f02
Merge branch 'develop' into conop-refactor · a8ff5f02
Valerio Mariani authored 12 years ago
```
Conflicts:
	modules/conop/src/model_check.hh
	tools/molck/main.cc
```
a8ff5f02

History
Merge branch 'develop' into conop-refactor
Valerio Mariani authored 12 years ago
```
Conflicts:
	modules/conop/src/model_check.hh
	tools/molck/main.cc
```