Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

BornAgain
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

7725552d

Commit 7725552d authored 12 years ago by pospelov

Downloads
- Plain Diff

Merge branch 'master' of git.jcns.frm2:GISASFW

Conflicts:
	App/src/TestIsGISAXS10.cpp

parents 9523e358 1933b7b9

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

App/inc/TestMesoCrystal.h 3 additions, 0 deletions

App/inc/TestMesoCrystal.h
App/src/TestIsGISAXS10.cpp 7 additions, 6 deletions

App/src/TestIsGISAXS10.cpp
App/src/TestMesoCrystal.cpp 35 additions, 23 deletions

App/src/TestMesoCrystal.cpp

with 45 additions and 29 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment