GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit 7f19b35e)

This is required because the compatibility header is broken in Qt 5.8

(cherry picked from commit f51523f8)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Possible solution for this crash. Needs to be tested in next KStars MacOS Release.
CCMAIL:rlancaste@gmail.com

Implement better solution to remember autoWCS and solverWCS option settings since we change them on the fly in PAH

Replacing default NGC/IC catalog with OpenNGC. Christian Dersch compiled this catalog from OpenNGC data into KStars format.
For more details, please check the kstars-openngc project https://github.com/lupinix/kstars-openngc

Fix Advance one time step backward or forward behavior. The lambda was executed after the scale tick was reset to its original value thereby rendering backward stepping useless. Now there is an explicit parameter in manualTick to specify direction.

Make consistent use of colons.

Try to solve the issue of external guiding frames once and for all. When using external guiding app, ALL CCDs BLOBs get automatically disabled. However, when trying to capture in ANY of the CCDs, then its corresponding BLOB shall be enable without warning the user, just transparently