From b52b05bf4d733b789db95016c232a484ca5bb18e Mon Sep 17 00:00:00 2001
From: Paolo Cignoni cignoni <paolo.cignoni@isti.cnr.it>
Date: Wed, 14 Jun 2006 04:18:28 +0000
Subject: [PATCH] *** empty log message ***

---
 docs/history.txt        |  4 ++++
 src/install/meshlab.nsi | 15 ++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/docs/history.txt b/docs/history.txt
index 9daf5ce89..130500466 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -33,9 +33,13 @@
 
 
   ** NEW FEATURES/PATCHES **
+Editing and Selection is IN!
+
 Bug in shaders
 Filter classes (now filters are assigned to different submenus)
 Intial mode faceted
+Real Installer for windows
+
 
 ------------------------------------------------------------------------------
 - Meshlab v0.6
diff --git a/src/install/meshlab.nsi b/src/install/meshlab.nsi
index b7130361b..41097bab3 100644
--- a/src/install/meshlab.nsi
+++ b/src/install/meshlab.nsi
@@ -20,7 +20,7 @@
 ; Welcome page
 !insertmacro MUI_PAGE_WELCOME
 ; License page
-!insertmacro MUI_PAGE_LICENSE "..\..\docs\license.txt"
+!insertmacro MUI_PAGE_LICENSE "..\..\docs\gpl.txt"
 ; Directory page
 !insertmacro MUI_PAGE_DIRECTORY
 ; Instfiles page
@@ -110,13 +110,14 @@ Section "MainSection" SEC01
   File "..\sample\TextureDouble_A.png"
   File "..\sample\Laurana50k.ply"
   SetOutPath "$INSTDIR\plugins\imageformats"
-  File "C:\Qt\4.1.0\plugins\imageformats\qjpeg1.dll"
+  File "C:\Qt\4.1.2\plugins\imageformats\qjpeg1.dll"
   SetOutPath "$INSTDIR"
-  File "C:\Qt\4.1.0\bin\QtCore4.dll"
-  File "C:\Qt\4.1.0\bin\QtGui4.dll"
-  File "C:\Qt\4.1.0\bin\QtOpenGL4.dll"
-  File "C:\Qt\4.1.0\bin\QtXml4.dll"
-  File "C:\Qt\4.1.0\bin\QtNetwork4.dll"
+  File "C:\Qt\4.1.2\bin\QtCore4.dll"
+  File "C:\Qt\4.1.2\bin\QtGui4.dll"
+  File "C:\Qt\4.1.2\bin\QtOpenGL4.dll"
+  File "C:\Qt\4.1.2\bin\QtXml4.dll"
+  File "C:\Qt\4.1.2\bin\QtNetwork4.dll"
+  File "C:\MinGW\bin\mingwm10.dll"
 SectionEnd
 
 Section -AdditionalIcons