]> git.tdb.fi Git - ext/subsurface.git/commit - gtk-gui.c
Merge branch 'forlinus' of git://git.hohndel.org/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Dec 2011 05:06:00 +0000 (21:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Dec 2011 05:06:00 +0000 (21:06 -0800)
commitb5139aeb22c8a28cac89b7f9a561bd9d4e2bb358
tree83a245b25b27816d190b79bdb31003d3e8861deb
parentb0759feef87fcf820682cb36d65f2252c2cc12ae
parent0a9e5aa7353476d70c4eb9866aeda979118d04e5
Merge branch 'forlinus' of git://git.hohndel.org/subsurface

* 'forlinus' of git://git.hohndel.org/subsurface:
  Return is not a function