comparison deploy/win32/tony.wxs @ 106:660d772b9f83 v0.1

Merge
author Chris Cannam
date Fri, 06 Dec 2013 17:09:27 +0000
parents 1fc1393fcb26
children 5e92de3bdf63
comparison
equal deleted inserted replaced
105:15d16a20fa42 106:660d772b9f83
34 Guid="5C3B7285-B652-4FE5-8A1D-AC92376F8AD5"> 34 Guid="5C3B7285-B652-4FE5-8A1D-AC92376F8AD5">
35 <File 35 <File
36 Id="pyinlib" 36 Id="pyinlib"
37 Name="pyin.dll" 37 Name="pyin.dll"
38 DiskId="1" 38 DiskId="1"
39 Source="..\pyin\win32-build\release\pyin.dll"/> 39 Source="..\pyin.dll"/>
40 <File 40 <File
41 Id="pyincat" 41 Id="pyincat"
42 Name="pyin.cat" 42 Name="pyin.cat"
43 DiskId="1" 43 DiskId="1"
44 Source="..\pyin\pyin.cat"/> 44 Source="..\pyin\pyin.cat"/>
86 <File 86 <File
87 Id="README" 87 Id="README"
88 Name="README" 88 Name="README"
89 DiskId="1" 89 DiskId="1"
90 Source="README"/> 90 Source="README"/>
91 <File
92 Id="CHANGELOG"
93 Name="CHANGELOG"
94 DiskId="1"
95 Source="CHANGELOG"/>
96 91
97 <File 92 <File
98 Id="winicon.ico" 93 Id="winicon.ico"
99 Name="tony-winicon.ico" 94 Name="tony-winicon.ico"
100 DiskId="1" 95 DiskId="1"