Konstantina Chremmou 489d8684e4 Merge remote-tracking branch 'upstream/master' into CAR-2214 ... Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com> # Conflicts: # Branding/branding.sh # mk/archive-unsigned.sh # mk/build.sh # mk/bumpBuildNumber.sh # mk/copy-build-output.sh # mk/declarations.sh # mk/tests-checks-cover.sh # mk/tests-checks.sh		2017-01-24 14:46:57 +00:00
..
Actions	Merge pull request #1382 from GaborApatiNagy/master_CA-176169	2017-01-19 15:14:25 +00:00
Alerts	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
Commands	CA-176169: Added copyright statement to files which it was missing from	2017-01-16 20:14:56 +00:00
ConsoleView	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
Controls	CA-176169: Added copyright statement to files which it was missing from	2017-01-16 20:14:56 +00:00
Core	Merge remote-tracking branch 'upstream/master' into CAR-2214	2017-01-24 14:46:57 +00:00
Diagnostics	CA-176169: Added copyright statement to files which it was missing from	2017-01-16 20:14:56 +00:00
Dialogs	Merge remote-tracking branch 'upstream/master' into CAR-2214	2017-01-24 14:46:57 +00:00
Help	CP-20468: XC Help for Revised Management Agent updates	2017-01-23 12:02:14 +00:00
HomePage	CA-220440: Remove CLM link from XenCenter home page	2016-09-14 15:31:21 +01:00
Images	CP-19257: Icon for Kylin Linux	2016-10-21 18:46:38 +01:00
Network	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
Plugins	Merge remote-tracking branch 'upstream/master' into CAR-2214	2017-01-24 14:46:57 +00:00
Properties	Merge remote-tracking branch 'upstream/master' into CAR-2214	2017-01-24 14:46:57 +00:00
RDP	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
ReportViewer
ServerDBs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
SettingsPanels	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
TabPages	Merge pull request #1382 from GaborApatiNagy/master_CA-176169	2017-01-19 15:14:25 +00:00
TestResources	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
Utils	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
Wizards	Merge pull request #1397 from letsboogey/master	2017-01-23 12:51:03 +00:00
Wlb	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
XenSearch	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
app.config	Merge branch 'master' into CAR-2214	2017-01-19 14:16:51 +00:00
Branding.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
GroupingTag.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
HomePage.ja.mht	CA-220440: Remove CLM link from XenCenter home page	2016-09-14 15:31:21 +01:00
HomePage.mht	CA-220440: Remove CLM link from XenCenter home page	2016-09-14 15:31:21 +01:00
HomePage.zh-CN.mht	CA-220440: Remove CLM link from XenCenter home page	2016-09-14 15:31:21 +01:00
Images.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
IMainWindow.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
LicenseTimer.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
MainWindow.cs	Merge remote-tracking branch 'upstream/master' into CAR-2214	2017-01-24 14:46:57 +00:00
MainWindow.Designer.cs	CP-16922: Implement GUI for enabling PVS read caching (#1179)	2016-09-22 15:08:15 +01:00
MainWindow.ja.resx	L10N:TRanslations check-ins	2016-10-19 16:37:43 +05:30
MainWindow.resx	Merge branch 'master' into CAR-2184	2016-09-26 13:26:31 +01:00
MainWindow.zh-CN.resx	L10N:TRanslations check-ins	2016-10-19 16:37:43 +05:30
MainWindowTreeBuilder.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
OrganizationalView.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
PasswordsRequest.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
PowerManagment.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
Program.cs	Merge remote-tracking branch 'upstream/master' into CAR-2214	2017-01-24 14:46:57 +00:00
Settings.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
SettingsUpdate.cs	CA-176169: Added copyright statement to files which it was missing from	2017-01-16 20:14:56 +00:00
UpdateManager.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
UpdateManager.DelayCalculator.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
WinformsXenAdminConfigProvider.cs	Merge remote-tracking branch 'upstream/master' into CAR-2214	2017-01-24 14:46:57 +00:00
XCPluginSchema.xsd
XenAdmin.csproj	CP-20065: Change "Automatic Update" to "Automated Updates"	2016-12-10 14:44:15 +00:00
XenAdmin.manifest
XenAdmin.rc