Dirk Hohndel a61c04bb58 Merge branch 'atdotde'
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	qt-ui/diveplanner.cpp
2014-05-26 09:59:08 -07:00
..
2014-02-27 20:09:57 -08:00
2014-02-08 08:00:27 -08:00
2014-05-24 06:42:10 -07:00
2014-02-27 11:44:59 -08:00
2014-05-26 09:59:08 -07:00
2014-05-22 11:40:22 -07:00
2014-02-27 20:09:57 -08:00
2014-05-22 11:40:22 -07:00
2014-05-22 11:40:22 -07:00
2014-05-22 11:40:22 -07:00
2014-05-22 11:40:22 -07:00
2014-05-22 11:40:22 -07:00
2014-05-22 11:40:22 -07:00
2014-05-22 11:40:22 -07:00
2014-05-22 11:40:22 -07:00
2014-05-22 11:40:22 -07:00
2014-05-22 11:40:22 -07:00
2014-05-22 11:40:22 -07:00
2014-05-22 11:40:22 -07:00