From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Nov 2011 20:07:49 +0000 (-0800)
Subject: Merge branch 'windows-fixes' of git://git.hohndel.org/subsurface
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=ee68ada729837162e29d879ca408836d0d66c7ac;p=ext%2Fsubsurface.git

Merge branch 'windows-fixes' of git://git.hohndel.org/subsurface

* 'windows-fixes' of git://git.hohndel.org/subsurface:
  fix mingw-win32 specific warnings in libdivecomputer.c
  Fix mingw-make.sh to find correct xslt-config
---

ee68ada729837162e29d879ca408836d0d66c7ac