mirror of
https://github.com/xcp-ng/xenadmin.git
synced 2024-11-25 14:27:26 +01:00
86d2acee7f
Conflicts: CFUValidator/CFUValidator.cs CFUValidator/OutputDecorators/XenCenterUpdateDecorator.cs CFUValidator/OutputDecorators/XenServerUpdateDecorator.cs XenAdmin/TabPages/ManageUpdatesPage.cs XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs XenAdmin/Wizards/PatchingWizard/PatchingWizard_PrecheckPage.cs XenModel/Actions/Updates/XenCenterVersion.cs XenModel/Actions/Updates/XenServerVersion.cs XenModel/Messages.Designer.cs XenModel/Messages.resx |
||
---|---|---|
.. | ||
ActionBaseExtensions.cs | ||
Clip.cs | ||
CueBannersManager.cs | ||
Drawing.cs | ||
ExtensionMethods.cs | ||
FormFontFixer.cs | ||
HealthCheck.cs | ||
HelpersGUI.cs | ||
HiddenFeatures.cs | ||
History.cs | ||
Metadata.cs | ||
Registry.cs | ||
Updates.cs | ||
VMGroup.cs | ||
WebBrowser2.cs | ||
Win32Window.cs |