Merge branch 'taxonomy'

This commit is contained in:
Dirk Hohndel 2015-07-02 07:03:03 -07:00
commit f554c2d16c
20 changed files with 1358 additions and 65 deletions

View file

@ -306,6 +306,7 @@ set(SUBSURFACE_CORE_LIB_SRCS
configuredivecomputer.cpp
configuredivecomputerthreads.cpp
divesitehelpers.cpp
taxonomy.c
checkcloudconnection.cpp
windowtitleupdate.cpp
divelogexportlogic.cpp