-
Artem Fedoskin authored
Merge branch 'master' into gsoc2016-kstarslite-android-build. Fixed merge conflicts in CMakeLists.txt, datahandlers/catalogdb.h and kstars/CMakeLists.txt
bad8ee29
Merge branch 'master' into gsoc2016-kstarslite-android-build. Fixed merge conflicts in CMakeLists.txt, datahandlers/catalogdb.h and kstars/CMakeLists.txt