Commits on Dec 29, 2018

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    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"
    l10n daemon script committed Dec 29, 2018
    Configuration menu
    Copy the full SHA
    6ac85ab View commit details
    Browse the repository at this point in the history

  2. SVN_SILENT made messages (.desktop file) - always resolve ours 

    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"
    l10n daemon script committed Dec 29, 2018
    Configuration menu
    Copy the full SHA
    e50b54d View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2019

  1. initial commit of hdf5 datasource

    Mathew Galloway:wq committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    9256dbe View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2019

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    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"
    l10n daemon script committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    f3f3f90 View commit details
    Browse the repository at this point in the history

  2. additional hdf5 datasource files that were not added last time becaus… 

    …e I am dumb
    Mathew Galloway:wq committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    a153f75 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of git://anongit.kde.org/kst-plot

    Mathew Galloway:wq committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    ddc3701 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2019

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    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"
    l10n daemon script committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    f3213dd View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2019

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    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"
    l10n daemon script committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    1f0c679 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2019

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    aac161c View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2019

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    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"
    l10n daemon script committed Feb 14, 2019
    Configuration menu
    Copy the full SHA
    bd7f94c View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2019

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    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"
    l10n daemon script committed Mar 3, 2019
    Configuration menu
    Copy the full SHA
    d10e6b0 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2019

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    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"
    l10n daemon script committed Mar 23, 2019
    Configuration menu
    Copy the full SHA
    373b19c View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2019

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    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"
    l10n daemon script committed Mar 25, 2019
    Configuration menu
    Copy the full SHA
    35c35e1 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2019

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Apr 24, 2019
    Configuration menu
    Copy the full SHA
    8294c2f View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2019

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    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"
    l10n daemon script committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    3781b17 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2019

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    3893db2 View commit details
    Browse the repository at this point in the history

  2. SVN_SILENT made messages (.desktop file) - always resolve ours 

    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"
    l10n daemon script committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    e09cb50 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2019

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    86bde08 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2019

  1. SVN_SILENT made messages (.desktop file) - always resolve ours 

    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"
    l10n daemon script committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    1096bd5 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2019

  1. Apply patch from tormodvolden. 

    Message grammar typos and console logs on windows.
    @netterfield
    netterfield committed Sep 14, 2019
    Configuration menu
    Copy the full SHA
    129d647 View commit details
    Browse the repository at this point in the history

  2. Fix build for ubuntu 19.04 

    Add missing include.
    @netterfield
    netterfield committed Sep 14, 2019
    Configuration menu
    Copy the full SHA
    2740798 View commit details
    Browse the repository at this point in the history