summaryrefslogtreecommitdiffstats
path: root/display-gtk.h
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-12-27 09:27:33 -0800
committerGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-12-27 09:27:33 -0800
commita8676438a72f3016daa74984def979797ded635a (patch)
tree2185d9fe1eb7f8024c65fd5649777aef89474a22 /display-gtk.h
parent210781e7be5c414fc2f8989af8b9f78fbab5d6fe (diff)
parent265fa8ec1fb8c666cb38cd8fed3561f6e52649d6 (diff)
parent4dfbb7394f9aea8b79d46eb4dbb8082898811512 (diff)
downloadsubsurface-a8676438a72f3016daa74984def979797ded635a.tar.gz
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