From: Linus Torvalds Date: Tue, 20 Sep 2011 17:12:24 +0000 (-0700) Subject: Merge git://github.com/sirowain/subsurface X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=03b2e565503d383acc5f2867404cc39c0a2add80;p=ext%2Fsubsurface.git Merge git://github.com/sirowain/subsurface * git://github.com/sirowain/subsurface: Fix Segmentation fault when trying to print an empty plot. Provide an icon for subsurface. Added a comment about libusb dependency in Makefile. --- 03b2e565503d383acc5f2867404cc39c0a2add80