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

289a14fb

Commit 289a14fb authored 12 years ago by pospelov

Downloads
- Plain Diff

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

parents 7e145547 f6af0976

No related branches found

No related tags found

No related merge requests found

Changes 4

Expand all Hide whitespace changes

Inline Side-by-side

Showing

App/src/IsGISAXSTools.cpp 2 additions, 2 deletions

App/src/IsGISAXSTools.cpp
Core/Algorithms/src/Experiment.cpp 2 additions, 1 deletion

Core/Algorithms/src/Experiment.cpp
ThirdParty/gtest/gtest-1.6.0/xcode/gtest.xcodeproj/project.pbxproj 135 additions, 3 deletions

...y/gtest/gtest-1.6.0/xcode/gtest.xcodeproj/project.pbxproj
XCode_GISASFW.xcodeproj/project.pbxproj 68806 additions, 0 deletions

XCode_GISASFW.xcodeproj/project.pbxproj

with 68945 additions and 6 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