Commits on Jun 2, 2020

  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 Jun 2, 2020
    Configuration menu
    Copy the full SHA
    845b3a0 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2020

  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 Jun 17, 2020
    Configuration menu
    Copy the full SHA
    f74321e View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2020

  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 Jun 18, 2020
    Configuration menu
    Copy the full SHA
    6f8880f View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2020

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    d8ff520 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 Jun 24, 2020
    Configuration menu
    Copy the full SHA
    9f06960 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2020

  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 Jun 25, 2020
    Configuration menu
    Copy the full SHA
    1195e4d View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2020

  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 26, 2020
    Configuration menu
    Copy the full SHA
    ace16ef View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2020

  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 4, 2020
    Configuration menu
    Copy the full SHA
    2346aa1 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2020

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    5473932 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2020

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    ddaf2f9 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2020

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    87d88ae View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2020

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    dff1110 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2020

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    22c5dd3 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2020

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    e909825 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2020

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Nov 5, 2020
    Configuration menu
    Copy the full SHA
    b2e8bcf View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2020

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Nov 7, 2020
    Configuration menu
    Copy the full SHA
    592bf01 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2020

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    9cd4365 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2021

  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 Jan 24, 2021
    Configuration menu
    Copy the full SHA
    38eddb5 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2021

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    2f10136 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2021

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    6e92ce0 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2021

  1. GIT_SILENT made messages (after extraction)

    l10n daemon script committed Mar 27, 2021
    Configuration menu
    Copy the full SHA
    44c7d32 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2021

  1. Fix CMake-time with CMake 3.20 

    Having multiple else-blocks for a single if() is now a syntax
error; they need to be elseif() with only a single
optional else() at the end.
    @adriaandegroot
    adriaandegroot committed Apr 2, 2021
    Configuration menu
    Copy the full SHA
    6a41644 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2021

  1. Drop woefully outdated RPM spec file 

    It refers to KDE 3 bits, so better remove it instead of confusing
users.
    @pinotree
    pinotree committed May 22, 2021
    Configuration menu
    Copy the full SHA
    24d378c View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2021

  1. Add option to hide status bar. 

    Inspired by patch submitted to the list by Nadav Aharoni.
    @netterfield
    netterfield committed Jun 30, 2021
    Configuration menu
    Copy the full SHA
    254ee25 View commit details
    Browse the repository at this point in the history