From 92afa6cc28ff23cc09af90fe1cfb2cbaa42247ec Mon Sep 17 00:00:00 2001 From: Volker Ruppert Date: Mon, 6 Aug 2012 20:16:53 +0000 Subject: [PATCH] - updated MSVC plugins workspace - fixed duplicate resource id --- .../win32/vs2008ex-plugins-workspace.zip | Bin 75110 -> 75098 bytes bochs/win32res.rc | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/bochs/build/win32/vs2008ex-plugins-workspace.zip b/bochs/build/win32/vs2008ex-plugins-workspace.zip index 044317065f5ba28f8ce27a08f6a4d29f354ed363..0c64f7488a687314ae9cfbe7897782d35f201a0d 100644 GIT binary patch delta 3617 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 WrUN)YQ$c`+x}6aMdCCNk>iQpm*pdPO delta 3685 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 Hpk($R?<=E! diff --git a/bochs/win32res.rc b/bochs/win32res.rc index 12f39ea3c..4d3a175d1 100644 --- a/bochs/win32res.rc +++ b/bochs/win32res.rc @@ -6,7 +6,7 @@ ICON_BOCHS ICON build\win32\nsis\logo.ico 1 ICON build\win32\nsis\bochs.ico // Manifest for both 32-bit and 64-bit Windows -1 24 build\win32\bochs.manifest +2 24 build\win32\bochs.manifest ASK_DLG DIALOG 30, 30, 200, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU