]> git.tdb.fi Git - ext/subsurface.git/commit
projects / ext / subsurface.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit1531a37dd0b74fcb06ca06fd2f225d4a2d228a87
tree87edc576053e177afb4a3bcddee4876cea0ece47tree | snapshot
parenta32d28d5e388ab3e31eadcd329814488fa5e8b1bcommit | diff
parentc15f798a85db53dae404a9113266a4d2bc72fbc6commit | diff
Merge branch 'uemis-integration' of git://github.com/dirkhh/subsurface

* '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
gtk-gui.c diff1 | diff2 | blob | history
uemis.c diff1 | diff2 | blob | history
Rough divelog in C and Gtk (from https://github.com/torvalds/subsurface)