Merge branch 'pyside6' into 'master' (28cb7bae) · 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

28cb7bae

Commit 28cb7bae authored 3 years ago by Garrett Bates

Downloads
- Plain Diff

Merge branch 'pyside6' into 'master'

Pyside6

See merge request passoft/nexus!9

parents 71ac621d 5d792953

No related branches found

No related tags found

1 merge request!9Pyside6

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

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

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

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

nexus/NRLWizard.py
nexus/icons_rc.py 10171 additions, 10199 deletions

nexus/icons_rc.py
nexus/nexus.py 27 additions, 18 deletions

nexus/nexus.py
nexus/right_frame_wire_ui.py 0 additions, 147 deletions

nexus/right_frame_wire_ui.py
setup.py 1 addition, 1 deletion

setup.py

with 10214 additions and 10380 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