]> git.tdb.fi Git - ext/subsurface.git/commitdiff
projects / ext / subsurface.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15e3b5f 9a853c5)
Merge git://github.com/sirowain/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Sep 2011 17:12:24 +0000 (10:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Sep 2011 17:12:24 +0000 (10:12 -0700)
* 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  2 
main.c patch | diff1 | diff2 | blob | history

diff --cc main.c
Simple merge
Rough divelog in C and Gtk (from https://github.com/torvalds/subsurface)