]> git.tdb.fi Git - ext/subsurface.git/commitdiff
Merge branches 'windows', 'docs' and 'forlinus' of git://git.hohndel.org/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Dec 2011 17:27:33 +0000 (09:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Dec 2011 17:27:33 +0000 (09:27 -0800)
* '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

1  2  3 
Documentation/user-manual.txt

Simple merge