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
..
AssemblyInfo.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
licenses.licx	CP-4816: Initial commit to git repo	2013-06-24 12:41:48 +01:00
Resources.Designer.cs	CP-19257: Icon for Kylin Linux	2016-10-21 18:46:38 +01:00
Resources.ja.resx	L10N:Translations check-ins	2016-12-21 16:20:30 +00:00
Resources.resx	CP-19257: Icon for Kylin Linux	2016-10-21 18:46:38 +01:00
Resources.zh-CN.resx	L10N:Translations check-ins	2016-12-21 16:20:30 +00:00
Settings.Designer.cs	Enable roaming for proxy authentication settings	2017-01-19 14:39:01 +00:00
Settings.settings	Enable roaming for proxy authentication settings	2017-01-19 14:39:01 +00:00