From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Dec 2011 17:27:33 +0000 (-0800)
Subject: Merge branches 'windows', 'docs' and 'forlinus' of git://git.hohndel.org/subsurface
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=a8676438a72f3016daa74984def979797ded635a;hp=265fa8ec1fb8c666cb38cd8fed3561f6e52649d6;p=ext%2Fsubsurface.git

Merge branches 'windows', 'docs' and 'forlinus' of git://git.hohndel.org/subsurface

* 'windows' of git://git.hohndel.org/subsurface:
  Fixes for the Windows installer

* 'docs' of git://git.hohndel.org/subsurface:
  Version 0.0.7 of user manual

* 'forlinus' of git://git.hohndel.org/subsurface:
  Remove unused return value
---

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 039f703..b9379e6 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -8,7 +8,7 @@ Autor documentation: Jacco van Koll <jko@haringstad.com>
 
 Scope of this document is the usage of the program.
 Please read the build manual for instructions how to build the
-software and (if needed) it's dependencies.
+software and (if needed) its dependencies.
 
 Audience: Fun Divers, Tec Divers, Professional Divers
 
@@ -320,7 +320,7 @@ Maybe you have been using JDivelog and you have a lot of dives logged in
 this program. You don't have to type all information by hand into
 Subsurface, because you can import your divelogs from JDivelog.
 
-JDivelog stores it's information into files with the extention of .jlb.
+JDivelog stores its information into files with the extention of .jlb.
 These .jlb contain all the information that has been stored, except your
 images in xml format.
 
diff --git a/equipment.c b/equipment.c
index 023db75..482fb4e 100644
--- a/equipment.c
+++ b/equipment.c
@@ -64,9 +64,8 @@ static int convert_pressure(int mbar, double *p)
 	return decimals;
 }
 
-static int convert_volume_pressure(int ml, int mbar, double *v, double *p)
+static void convert_volume_pressure(int ml, int mbar, double *v, double *p)
 {
-	int decimals = 1;
 	double volume, pressure;
 
 	volume = ml / 1000.0;
@@ -78,13 +77,11 @@ static int convert_volume_pressure(int ml, int mbar, double *v, double *p)
 
 		if (output_units.pressure == PSI) {
 			pressure = mbar_to_PSI(mbar);
-			decimals = 0;
 		} else
 			pressure = mbar / 1000.0;
 	}
 	*v = volume;
 	*p = pressure;
-	return decimals;
 }
 
 static void set_cylinder_type_spinbuttons(struct cylinder_widget *cylinder, int ml, int mbar)
diff --git a/packaging/windows/subsurface.nsi b/packaging/windows/subsurface.nsi
index 09a6eb0..280991f 100644
--- a/packaging/windows/subsurface.nsi
+++ b/packaging/windows/subsurface.nsi
@@ -80,11 +80,14 @@ file /oname=libpangoft2-1.0-0.dll dll\libpangoft2-1.0-0.dll
 file /oname=libpangowin32-1.0-0.dll dll\libpangowin32-1.0-0.dll
 file /oname=libpixman-1-0.dll dll\libpixman-1-0.dll
 file /oname=libpng15-15.dll dll\libpng15-15.dll
-file /oname=libtiff-3.dll dll\libtiff-3.dll
+file /oname=libtiff-5.dll dll\libtiff-5.dll
 file /oname=libxml2-2.dll dll\libxml2-2.dll
 file /oname=libxslt-1.dll dll\libxslt-1.dll
 file /oname=pthreadGC2.dll dll\pthreadGC2.dll
 file /oname=zlib1.dll dll\zlib1.dll
+file /oname=libusb-1.0.dll dll\libusb-1.0.dll
+file /oname=SuuntoSDM.xslt ../../xslt/SuuntoSDM.xslt
+file /oname=jdivelog2subsurface.xslt ../../xslt/jdivelog2subsurface.xslt
 sectionEnd
 
 section "uninstall"