]> git.tdb.fi Git - ext/subsurface.git/commitdiff
projects / ext / subsurface.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a32d28d c15f798)
Merge branch 'uemis-integration' of git://github.com/dirkhh/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Oct 2011 19:13:54 +0000 (12:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Oct 2011 19:13:54 +0000 (12:13 -0700)
* 'uemis-integration' of git://github.com/dirkhh/subsurface:
  Remove the ability to 'Import' .SDA files
  Integrate loading of uemis SDA files into the regular xml parsing
  First steps towards integrating SDA files into the default XML loading

1  2 
gtk-gui.c patch | diff1 | diff2 | blob | history
uemis.c patch | diff1 | diff2 | blob | history

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