From: Linus Torvalds Date: Mon, 3 Oct 2011 19:13:54 +0000 (-0700) Subject: Merge branch 'uemis-integration' of git://github.com/dirkhh/subsurface X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=commitdiff_plain;h=1531a37dd0b74fcb06ca06fd2f225d4a2d228a87 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 --- 1531a37dd0b74fcb06ca06fd2f225d4a2d228a87