Merge branch 'feature-pyside2_switch' into 'master' (72dae322) · Commits · Software Public / PASSOFT / nexus · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

nexus
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

72dae322

Commit 72dae322 authored 2 years ago by Maeva Pourpoint

Downloads
- Plain Diff

Merge branch 'feature-pyside2_switch' into 'master'

Feature pyside2 switch

See merge request !14

parents 1bca7a5b 7a08ec8e

No related branches found

No related tags found

1 merge request!14Feature pyside2 switch

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

conda-recipe/meta.yaml 2 additions, 2 deletions

conda-recipe/meta.yaml
nexus/ChannelSelectDialog.py 2 additions, 2 deletions

nexus/ChannelSelectDialog.py
nexus/NRLWizard.py 1 addition, 1 deletion

nexus/NRLWizard.py
nexus/__init__.py 1 addition, 1 deletion

nexus/__init__.py
nexus/icons_rc.py 1 addition, 1 deletion

nexus/icons_rc.py
nexus/inv_model.py 1 addition, 1 deletion

nexus/inv_model.py
nexus/inventorymodel.py 1 addition, 1 deletion

nexus/inventorymodel.py
nexus/nexus.py 4 additions, 4 deletions

nexus/nexus.py
nexus_constructor/construct.yaml 1 addition, 1 deletion

nexus_constructor/construct.yaml
setup.cfg 1 addition, 1 deletion

setup.cfg
setup.py 3 additions, 1 deletion

setup.py

with 18 additions and 16 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