merged 1.3 r978:979 into trunk

This commit is contained in:
Nick Bolton
2011-05-08 22:46:06 +00:00
parent ab045a1b8e
commit 627771cf13
2 changed files with 14 additions and 2 deletions

View File

@@ -17,7 +17,6 @@
!define vcRedistFile "vcredist_${arch}.exe"
!define startMenuApp "qsynergy.exe"
!define binDir "..\bin"
!define libDir "..\lib"
!define uninstall "uninstall.exe"
!define icon "..\src\gui\res\win\QSynergy.ico"
!define controlPanelReg "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"
@@ -115,7 +114,7 @@ Section "Server and Client" core
; client and server files
File "${binDir}\Release\synergys.exe"
File "${binDir}\Release\synergyc.exe"
File "${libDir}\Release\synrgyhk.dll"
File "${binDir}\Release\synrgyhk.dll"
SectionEnd