# HG changeset patch
# User Chris Cannam
# Date 1386349767 0
# Node ID 660d772b9f83dad9e3d38a8a6fbd6a9a36c42d38
# Parent  15d16a20fa4236d260479544f1c2c788d02cea38# Parent  1fc1393fcb267bbeed4e3f8a0ddaeb8f7527511d
Merge

diff -r 15d16a20fa42 -r 660d772b9f83 deploy/win32/tony.wxs
--- a/deploy/win32/tony.wxs	Fri Dec 06 17:05:25 2013 +0000
+++ b/deploy/win32/tony.wxs	Fri Dec 06 17:09:27 2013 +0000
@@ -36,7 +36,7 @@
                 Id="pyinlib"
                 Name="pyin.dll"
                 DiskId="1"
-                Source="..\pyin\win32-build\release\pyin.dll"/>
+                Source="..\pyin.dll"/>
             <File
                 Id="pyincat"
                 Name="pyin.cat"
@@ -88,11 +88,6 @@
                   Name="README"
                   DiskId="1"
                   Source="README"/>
-              <File
-                  Id="CHANGELOG"
-                  Name="CHANGELOG"
-                  DiskId="1"
-                  Source="CHANGELOG"/>
 
               <File
                   Id="winicon.ico"