diff --git a/docs/readme.txt b/docs/readme.txt
index 9afedd311..1a5ab90f2 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -23,28 +23,28 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--- General Info ---
-MeshLab is an extendible mesh processing system, aimed to the user
-assisted cleaning, filtering, editing and rendering of unstructured 3D
-triangular meshes.
-The tool found its natural use for the processiing of the meshes that usually
-arise in 3d scanning. The system is heavily based on
-the VCG library (vcg.sf.net). The current version of Meshlab was developed during
-the FGT (Foundation of Three-dimensional Graphics) course of the Computer Science
-department ofUniversity of Pisa.
+MeshLab is an open source portable and extendible system for the processing and editing of unstructured 3D triangular meshes.
+The system is aimed to help the processing of the typical not-so-small unstructured models arising in 3D scanning, providing a set of tools for editing, cleaning, healing, inspecting, rendering and converting this kind of meshes.
+
+The project is supported by the European Networks of Excellence Epoch
+
+The system is heavily based on the VCG library developed at the Visual Computing Lab of ISTI - CNR, for all the core mesh processing tasks. The MeshLab system started as a part of the FGT course of the Computer Science department of University of Pisa and most of the code (~15k lines) of the first versions was written by a handful of students.
--- Main Features ---
-
-Input/output in many formats (PLY, STL, OFF, OBJ)
-Extendible plugins based architecture, writing new mesh
-processing functions, filters and format support is quite easy.
-Cleaning Filters
- Removal of duplicated, unreferenced vertices, null faces
- Subdivision filters
-Opengl Shader based rendering
-Large snapshot for hi quality printing
-Various Colorization Filters
- Gaussian Curvature
- Border edges
+# Interactive selection and deletion of portion of the mesh. Even for large models.
+# Input/output in many formats (PLY, STL, OFF, OBJ, 3DS)
+# Extendible plugins based architecture, writing new mesh processing functions, colorization filters and support for different file formats is quite easy (look at this code sample)
+# Cleaning Filters:
+ * removal of duplicated, unreferenced vertices, null faces
+ * subdivision filters (midpoint, loop and butterfly)
+ * coherent normal unification and flipping
+# OpenGL Shader based rendering (write your own shader!) compatible with Shader Designer
+# Large rendering (up to 16k x 16k) for high quality printing
+# Various Colorization/inspecting Filters
+ * Gaussian and mean curvature
+ * Border edges
+ * Non two-manifold faces
+# The history of the all performed cleaning/editing actions can be re-played on different meshes or saved and for archival purposes.
--- References ----
@@ -74,8 +74,3 @@ P. Cignoni and
A. Buzzelli, L. Colombini, G. Gangemi, M. Latronico, F. Mazzanti,
A. Mochi, D. Portelli, D. Vacca, F. Vannini, A. Venturi
---- Extra Credits ---
-
-Thanks goes to
-Christopher January, Dave Brondsema, Christian Ehrlicher, Ralf Habacker
-for their unofficial patch for Qt4 ( http://sourceforge.net/projects/qtwin ).
diff --git a/src/install/meshlab.nsi b/src/install/meshlab.nsi
index 41097bab3..8faa0f7a0 100644
--- a/src/install/meshlab.nsi
+++ b/src/install/meshlab.nsi
@@ -110,14 +110,15 @@ Section "MainSection" SEC01
File "..\sample\TextureDouble_A.png"
File "..\sample\Laurana50k.ply"
SetOutPath "$INSTDIR\plugins\imageformats"
- File "C:\Qt\4.1.2\plugins\imageformats\qjpeg1.dll"
+ File "C:\Qt\4.1.3\plugins\imageformats\qjpeg1.dll"
SetOutPath "$INSTDIR"
- 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:\Qt\4.1.3\bin\QtCore4.dll"
+ File "C:\Qt\4.1.3\bin\QtGui4.dll"
+ File "C:\Qt\4.1.3\bin\QtOpenGL4.dll"
+ File "C:\Qt\4.1.3\bin\QtXml4.dll"
+ File "C:\Qt\4.1.3\bin\QtNetwork4.dll"
File "C:\MinGW\bin\mingwm10.dll"
+ File "..\docs\readme.txt"
SectionEnd
Section -AdditionalIcons
diff --git a/src/meshlab/images/logo_epoch.png b/src/meshlab/images/logo_epoch.png
index d0e150ed3..0dbd8b288 100644
Binary files a/src/meshlab/images/logo_epoch.png and b/src/meshlab/images/logo_epoch.png differ
diff --git a/src/meshlab/meshlab.qrc b/src/meshlab/meshlab.qrc
index 8ad0dd9a5..ef10f190d 100644
--- a/src/meshlab/meshlab.qrc
+++ b/src/meshlab/meshlab.qrc
@@ -19,7 +19,7 @@
images/textures.png
images/wire.png
images/no_edit.png
- images/logo_epoch.png
-
-
+ images/logo_epoch.png
+ images/logo_epoch_2.png
+
diff --git a/src/meshlab/ui/aboutDialog.ui b/src/meshlab/ui/aboutDialog.ui
index 6741a7096..7dd255501 100644
--- a/src/meshlab/ui/aboutDialog.ui
+++ b/src/meshlab/ui/aboutDialog.ui
@@ -9,7 +9,7 @@
0
0
628
- 668
+ 622
@@ -41,158 +41,13 @@
true
-
-
-
- 10
- 469
- 611
- 191
-
-
-
-
- 0
-
-
- 6
-
- -
-
-
-
-
-
- false
-
-
-
- 8
-
-
- 6
-
-
-
-
-
-
-
-
- :/images/logo.png
-
-
-
- -
-
-
- <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:MS Shell Dlg; font-size:8.25pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">VCGLib</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"><span style=" font-weight:400;">http://vcg.sf.net </span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Visual and Computer Graphics Library</p><p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Copyright(C) 2005-2006</p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Visual Computing Lab </span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">http://vcg.isti.cnr.it </p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ISTI - Italian National Research Council</p></body></html>
-
-
-
-
-
-
- -
-
-
- 0
-
-
- 6
-
-
-
-
-
-
-
-
-
-
- 10
- 100
- 181
- 61
-
-
-
- Meshlab is supported
-by the Epoch network of excellence
-
-
- Qt::AlignCenter
-
-
-
-
-
- 50
- 10
- 100
- 100
-
-
-
-
- 100
- 100
-
-
-
-
- 100
- 100
-
-
-
-
-
-
- ..\images\logo_epoch.png
-
-
-
-
- -
-
-
- 0
-
-
- 6
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- OK
-
-
-
-
-
-
-
-
-
9
9
611
- 453
+ 381
@@ -222,7 +77,7 @@ by the Epoch network of excellence
- :/images/eye_256_splash.png
+ :/images/eye_256_splash.png
@@ -318,6 +173,154 @@ by the Epoch network of excellence
+
+
+
+ 10
+ 390
+ 611
+ 221
+
+
+
+
+ 0
+
+
+ 6
+
+ -
+
+
+
+
+
+ false
+
+
+
+ 8
+
+
+ 6
+
+
-
+
+
+
+
+
+ :/images/logo.png
+
+
+
+ -
+
+
+ <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:MS Shell Dlg; font-size:8.25pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">VCGLib</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"><span style=" font-weight:400;">http://vcg.sf.net </span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Visual and Computer Graphics Library</p><p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Copyright(C) 2005-2006</p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Visual Computing Lab </span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">http://vcg.isti.cnr.it </p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ISTI - Italian National Research Council</p></body></html>
+
+
+
+
+
+
+ -
+
+
+ 0
+
+
+ 6
+
+
-
+
+
+
+
+
+
+
+ 50
+ 10
+ 100
+ 113
+
+
+
+
+ 100
+ 113
+
+
+
+
+ 100
+ 113
+
+
+
+
+
+
+ :/images/logo_epoch.png
+
+
+ false
+
+
+
+
+
+ 10
+ 130
+ 181
+ 61
+
+
+
+ Meshlab is supported
+by the Epoch network of excellence
+
+
+ Qt::AlignCenter
+
+
+
+
+ -
+
+
+ 0
+
+
+ 6
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ OK
+
+
+
+
+
+
+
+
+