Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

starblade
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

8563ad22

Commit 8563ad22 authored 7 years ago by Jakob Knollmueller

Downloads
- Plain Diff

Merge branch 'nifty4' into 'master'

# Conflicts:
#   1d_separation.py
#   hubble_separation.py

parents 06b39731 a2eabd51

No related branches found

No related tags found

1 merge request!3stuff

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

1d_separation.py 19 additions, 22 deletions

1d_separation.py
gui_app.py 126 additions, 33 deletions

gui_app.py
hubble_separation.py 35 additions, 20 deletions

hubble_separation.py
point_separation.py 25 additions, 26 deletions

point_separation.py
separation_energy.py 4 additions, 4 deletions

separation_energy.py
separator.kv 70 additions, 40 deletions

separator.kv

with 279 additions and 145 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