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

92dcb276

Commit 92dcb276 authored 7 years ago by Pospelov, Gennady

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/develop' into MessageService

parents 742e3c07 66adbc48

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

GUI/coregui/CMakeLists.txt 0 additions, 2 deletions

GUI/coregui/CMakeLists.txt
GUI/coregui/Views/widgetbox/widgetbox.cpp 1 addition, 1 deletion

GUI/coregui/Views/widgetbox/widgetbox.cpp
GUI/coregui/Views/widgetbox/widgetbox_dnditem.cpp 0 additions, 254 deletions

GUI/coregui/Views/widgetbox/widgetbox_dnditem.cpp
GUI/coregui/Views/widgetbox/widgetbox_dnditem.h 0 additions, 69 deletions

GUI/coregui/Views/widgetbox/widgetbox_dnditem.h
GUI/coregui/Views/widgetbox/widgetboxtreewidget.cpp 0 additions, 142 deletions

GUI/coregui/Views/widgetbox/widgetboxtreewidget.cpp
Tests/Functional/TestMachinery/TestUtils.cpp 2 additions, 2 deletions

Tests/Functional/TestMachinery/TestUtils.cpp
Wrap/python/__init__.py.in 4 additions, 1 deletion

Wrap/python/__init__.py.in
auto/Wrap/libBornAgainCore_wrap.cpp 1 addition, 1 deletion

auto/Wrap/libBornAgainCore_wrap.cpp
auto/Wrap/libBornAgainFit_wrap.cpp 1 addition, 1 deletion

auto/Wrap/libBornAgainFit_wrap.cpp

with 9 additions and 473 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