Merge branch 'master' into 'master' (7a6c4348) · Commits · Krisztián Löki / ess-opis · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

ess-opis
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7a6c4348

Commit 7a6c4348 authored 3 years ago by Te-Hung Tseng

Downloads
- Plain Diff

Merge branch 'master' into 'master'

ODH and TS2 PSS updates

See merge request ics-software/ess-opis!268

parents aa61f5fa 876cf876

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

NON-APPROVED/TS2/pss/embedded_displays/rad.bob 2 additions, 2 deletions

NON-APPROVED/TS2/pss/embedded_displays/rad.bob
NON-APPROVED/TS2/pss/popups/odh_faceplate.bob 0 additions, 10 deletions

NON-APPROVED/TS2/pss/popups/odh_faceplate.bob
NON-APPROVED/TS2/pss/popups/rad_faceplate.bob 2 additions, 2 deletions

NON-APPROVED/TS2/pss/popups/rad_faceplate.bob
NON-APPROVED/TS2/pss/symbols/rad/Ionising_radiation_green.svg 1 addition, 0 deletions

...APPROVED/TS2/pss/symbols/rad/Ionising_radiation_green.svg
NON-APPROVED/TS2/pss/symbols/rad/Ionising_radiation_grey.svg 1 addition, 0 deletions

NON-APPROVED/TS2/pss/symbols/rad/Ionising_radiation_grey.svg
NON-APPROVED/TS2/pss/symbols/rad/Ionising_radiation_red.svg 1 addition, 0 deletions

NON-APPROVED/TS2/pss/symbols/rad/Ionising_radiation_red.svg
NON-APPROVED/TS2/pss/symbols/rad/Ionising_radiation_yellow.svg 1 addition, 0 deletions

...PPROVED/TS2/pss/symbols/rad/Ionising_radiation_yellow.svg
NON-APPROVED/odh/ODH_Expert_Monit.bob 2 additions, 12 deletions

NON-APPROVED/odh/ODH_Expert_Monit.bob
NON-APPROVED/odh/ODH_Monit_Sub.bob 3 additions, 4 deletions

NON-APPROVED/odh/ODH_Monit_Sub.bob
NON-APPROVED/odh/TS2_ODH_Monit_Sub.bob 3 additions, 4 deletions

NON-APPROVED/odh/TS2_ODH_Monit_Sub.bob

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