[Kst-plot/kst] c5dddb: Fix merged build

[Barth Netterfield]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: c5dddb1cc54d7718ee99c7fe1eeb239ef45e2807
      https://github.com/Kst-plot/kst/commit/c5dddb1cc54d7718ee99c7fe1eeb239ef45e2807
  Author: Barth Netterfield <netterfield at astro.utoronto.ca>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M cmake/modules/MergedFilesBuild.cmake
    M cmake/travis-mac.sh
    M cmake/travis.sh
    M devel-docs/BugsAndFeatures
    M src/libkst/vectorfactory.cpp
    M src/libkstapp/mainwindow.cpp
    M src/libkstapp/shortcutdialog.cpp

  Log Message:
  -----------
  Fix merged build

BUG: 322289
Fix merged build.
Use merged build in travis build to speed it up.



      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.