Merge remote-tracking branch 'upstream/master' (afd93179) · Commits · ics-software / ess-opis · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

ess-opis
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

Admin message

The new Gitlab server on Ubuntu OS is running. Please if you see any issue let Software Infrastructure Team know

This is an archived project. Repository and other project resources are read-only.

afd93179

Commit afd93179 authored 6 years ago by Saeed Haghtalab

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master'

parents b98ea02b 44c036fd

No related branches found

No related tags found

2 merge requests!37Update DPL, FC and NPM OPI's,!34Update Doppler OPI with motion

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

NON-APPROVED/CONTROL-ROOM/central-services/cooling-water-low-system/skid-isrc/skid-isrc.bob 18 additions, 0 deletions

...services/cooling-water-low-system/skid-isrc/skid-isrc.bob
NON-APPROVED/lebt-010_vac/CommissioningTank.bob 0 additions, 0 deletions

NON-APPROVED/lebt-010_vac/CommissioningTank.bob
NON-APPROVED/lebt-010_vac/LEBT.bob 287 additions, 256 deletions

NON-APPROVED/lebt-010_vac/LEBT.bob
NON-APPROVED/lebt-010_vac/faceplates/vpp-vpdp/vac-vpdp-popup.bob 1 addition, 1 deletion

...ROVED/lebt-010_vac/faceplates/vpp-vpdp/vac-vpdp-popup.bob
NON-APPROVED/lebt-010_vac/faceplates/vpt/vac-vpt-popup.bob 1 addition, 1 deletion

NON-APPROVED/lebt-010_vac/faceplates/vpt/vac-vpt-popup.bob
NON-APPROVED/lebt-010_vac/faceplates/vvx/vac-vv-popup.bob 1 addition, 1 deletion

NON-APPROVED/lebt-010_vac/faceplates/vvx/vac-vv-popup.bob
NON-APPROVED/lebt-010_vac/faceplates/vvx/vac_isrc-vva.bob 153 additions, 0 deletions

NON-APPROVED/lebt-010_vac/faceplates/vvx/vac_isrc-vva.bob
NON-APPROVED/lebt-010_vac/widgets/vgc-vgd-vgp/vac_vgc-vgd-vgp.bob 1 addition, 1 deletion

...OVED/lebt-010_vac/widgets/vgc-vgd-vgp/vac_vgc-vgd-vgp.bob
NON-APPROVED/lebt-010_vac/widgets/vvmc/symbol_color_animation.js 27 additions, 3 deletions

...ROVED/lebt-010_vac/widgets/vvmc/symbol_color_animation.js
NON-APPROVED/lebt-010_vac/widgets/vvmc/vac_vvmc.bob 2 additions, 0 deletions

NON-APPROVED/lebt-010_vac/widgets/vvmc/vac_vvmc.bob

with 491 additions and 263 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