Linus Torvalds a1472a7247 Merge branch 'Subsurface-branch' of github.com:Subsurface-divelog/libdc into Subsurface-branch
Merge with Dirk's cleanups.

I had intentionally not updated my tree while I was pondering the
upstream merge with Jef's iostream changes, so I didn't have Dirk's
cleanups in my tree when I did that big merge.

This merge was trivial in comparison.

* 'Subsurface-branch' of github.com:Subsurface-divelog/libdc:
  Correctly determine git SHA if libdivecomputer is a git submodule
  Disable a couple of overly aggressive warnings
  Add configure flag to explicitly enable BLE support
2017-12-12 14:02:53 -08:00
..
2014-12-21 14:52:12 +01:00
2014-12-21 14:52:12 +01:00
2012-06-21 21:39:24 +02:00
2014-03-19 09:16:07 +01:00
2014-03-19 09:16:07 +01:00
2017-08-18 23:26:45 +02:00
2017-08-18 23:26:45 +02:00
2014-03-14 09:44:10 +01:00
2013-08-22 09:15:55 +02:00
2017-11-25 10:26:49 +01:00
2012-06-21 21:42:37 +02:00
2017-04-24 13:05:20 +02:00
2017-08-18 23:26:45 +02:00
2014-03-19 09:16:07 +01:00
2014-03-19 09:16:07 +01:00
2017-08-18 23:26:45 +02:00