Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

monitor-NaviX
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

20ba2738

Commit 20ba2738 authored 6 years ago by Martin Sauter

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	navimon/NaviPlotFunctions.py

parents 166e65f7 00996faa

No related branches found

No related tags found

No related merge requests found

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

NaviXMon.py 32 additions, 18 deletions

NaviXMon.py
navimon/NaviCommon.py 9 additions, 9 deletions

navimon/NaviCommon.py
navimon/NaviEvaluate.py 35 additions, 30 deletions

navimon/NaviEvaluate.py
navimon/NaviPlot.py 57 additions, 57 deletions

navimon/NaviPlot.py
navimon/NaviPlotFunctions.py 1 addition, 1 deletion

navimon/NaviPlotFunctions.py

with 134 additions and 115 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