Merge remote-tracking branch 'origin/master'
# Conflicts: # Accounts/users.act # AdvancedVFDIPP.med # Gfx/(RA-BAS-ME) Built-In Autotune-Faceplate.gfx # Gfx/(RA-BAS-ME) P_AIn-Faceplate.gfx # Gfx/(RA-BAS-ME) P_Alarm-Faceplate.gfx # Gfx/(RA-BAS-ME) P_Alarm-Help.gfx # Gfx/(RA-BAS-ME) P_Gate-Faceplate.gfx # Gfx/(RA-BAS-ME) P_Mode-Config.gfx # Gfx/(RA-BAS-ME) P_Mode-Help.gfx # Gfx/(RA-BAS-ME) P_PF755-Faceplate.gfx # Gfx/(RA-BAS-ME) P_PIDE-Faceplate.gfx # Gfx/(RA-BAS-ME) Process AnalogIn Family-Help.gfx # Gfx/(RA-BAS-ME) Process Motor Family-Help.gfx # Gfx/AlarmList.gfx # Gfx/ControlSetpoints.gfx # Gfx/History.gfx # Gfx/MAIN.gfx # Gfx/Permissives.gfx # Gfx/Popup_DHPressure.gfx # Gfx/Settings.gfx # Gfx/Trending.gfx # Gfx/Wellhead.gfx # Gfx/[ALARM].gfx # Gfx/[DIAGNOSTICS].gfx # Gfx/[INFORMATION].gfx # Global Objects/(RA-BAS-ME) BuiltIn Faceplate Objects.ggfx # Global Objects/(RA-BAS-ME) BuiltIn Graphics Library.ggfx # Global Objects/(RA-BAS-ME) BuiltIn Help Objects.ggfx # Global Objects/(RA-BAS-ME) Common Faceplate Objects.ggfx # Global Objects/(RA-BAS-ME) P_AIn Graphics Library.ggfx # Global Objects/(RA-BAS-ME) P_D4SD Graphics Library.ggfx # Global Objects/(RA-BAS-ME) P_D4SD Motor Graphics Library.ggfx # Global Objects/(RA-BAS-ME) P_DOut Graphics Library.ggfx # Global Objects/(RA-BAS-ME) P_LLS Graphics Library.ggfx # Global Objects/(RA-BAS-ME) P_Motor Graphics Library.ggfx # Global Objects/(RA-BAS-ME) P_Motor2Spd Graphics Library.ggfx # Global Objects/(RA-BAS-ME) P_MotorHO Graphics Library.ggfx # Global Objects/(RA-BAS-ME) P_MotorRev Graphics Library.ggfx # Global Objects/(RA-BAS-ME) P_PID Graphics Library.ggfx # Global Objects/(RA-BAS-ME) P_SMC Graphics Library.ggfx # Global Objects/(RA-BAS-ME) P_VSD Graphics Library.ggfx # Global Objects/(RA-BAS-ME) P_ValveMP Graphics Library.ggfx # Global Objects/(RA-BAS-ME) P_nPos Graphics Library.ggfx # Global Objects/(RA-BAS-ME) Process Alarm Objects.ggfx # Global Objects/(RA-BAS-ME) Process Diagnostic Objects.ggfx # Global Objects/(RA-BAS-ME) Process Faceplate Analog Objects.ggfx # Global Objects/(RA-BAS-ME) Process Faceplate Misc Objects.ggfx # Global Objects/(RA-BAS-ME) Process Faceplate Motor Objects.ggfx # Global Objects/(RA-BAS-ME) Process Faceplate Valve Objects.ggfx # Global Objects/(RA-BAS-ME) Process Graphics Library.ggfx # Global Objects/(RA-BAS-ME) Process Help Objects.ggfx # Global Objects/(RA-BAS-ME) Process Interlock Objects.ggfx # Global Objects/(RA-BAS-ME) Process Mode Objects.ggfx # PrivateDirectory/AdvancedVFDIPP.prd # PrivateDirectory/AdvancedVFDIPP.prd.bk # ProjectSettings/ProjectSettings.pts # TAG/ADVANCEDVFDIPP.CTL # TAG/ADVANCEDVFDIPP.MDF # TAG/ADVANCEDVFDIPP_log.ldf
This commit is contained in:
Patrick McDonagh