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.

1 files changed, 1 insertions, 0 deletions

diff --git a/main.c b/main.c
index d125169e2..dfd1b1447 100644
--- a/main.c
+++ b/main.c
@@ -449,6 +449,7 @@ int main(int argc, char **argv)
 
 	error_info_bar = NULL;
 	win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_icon_from_file(GTK_WINDOW(win), "icon.svg", NULL);
 	g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL);
 	main_window = win;