Skip to content

Commit 29efb8e

Browse files
committed
Merge branch 'dev' of https://github.com/huangpf/azure-powershell into vmss
Conflicts: setup/azurecmdfiles.wxi
2 parents b1d33ad + f072110 commit 29efb8e

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

setup/azurecmdfiles.wxi

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5103,6 +5103,27 @@
51035103
<ComponentRef Id="cmpE2870DA9D9EABA49600629B6564747C7" />
51045104
<ComponentRef Id="cmpD0CBA309930AE994CD67A5EB7C9B5B10" />
51055105
<ComponentRef Id="cmp7781002FCC3D1B3F0519A286C3E916E9" />
5106+
<ComponentRef Id="cmp26757C9254980E46634DDBF7FA3DC0EE" />
5107+
<ComponentRef Id="cmp6A7508D641ABC42CBC47E8C71F5F7960" />
5108+
<ComponentRef Id="cmpC40A93532FA1B6B3CC495C44287DD4FD" />
5109+
<ComponentRef Id="cmpBA0E9AFF4B786F09AF8CA24A30DA0B3E" />
5110+
<ComponentRef Id="cmpC329903507D2C760A07068087F01E0F0" />
5111+
<ComponentRef Id="cmpA98F34A253A4D33476481745DC338B72" />
5112+
<ComponentRef Id="cmp3218E7B28F820C614786457C75F68FDE" />
5113+
<ComponentRef Id="cmpD48ED88B3D289F81DFEB1BE8D8BDFDBB" />
5114+
<ComponentRef Id="cmp9D7D5FC99E7FB18787B78A246F386511" />
5115+
<ComponentRef Id="cmp01D375B8D50C7BB0584789AF3262E6EB" />
5116+
<ComponentRef Id="cmp75A4FEB22AE2D2B4A03F04A4C7E8D32E" />
5117+
<ComponentRef Id="cmp71E32FD24E0F5940BB92662C539A00BA" />
5118+
<ComponentRef Id="cmpC0D2910F1E8DD94834985F8BBB1133A5" />
5119+
<ComponentRef Id="cmpB8F6CEC74DC065D2D08FB82A76CF7411" />
5120+
<ComponentRef Id="cmpFF465588FB32BEF908242C7BC2621DF6" />
5121+
<ComponentRef Id="cmpDEF412B27E738D9D17F5B36668F8D91C" />
5122+
<ComponentRef Id="cmp28E39E96F170CA278BC16412EA44C66B" />
5123+
<ComponentRef Id="cmpD4CEF26E124B97CCF29E53FCEA63DF11" />
5124+
<ComponentRef Id="cmp91E4DB8DA0930C4EC30468BFA8F0C631" />
5125+
<ComponentRef Id="cmp5A44264503BFAF83A7DA76A44878BC02" />
5126+
<ComponentRef Id="cmp3C91684B2D48E072C9B84111E717AC26" />
51065127
<ComponentRef Id="cmpFEE86D031CEC182D160B80C5EC00914F" />
51075128
<ComponentRef Id="cmpAB04FC1EEE889CA90013762F64086BFF" />
51085129
<ComponentRef Id="cmp4714276292444ADF7D34F509F31C8102" />

0 commit comments

Comments
 (0)