Commits · b3e941e73604f6dbd106ae9fe25368b24be5cbbf · Graphics / Okular

27 Sep, 2017 1 commit

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

Script Kiddy authored Sep 27, 2017

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"

b3e941e7

25 Sep, 2017 1 commit

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

Script Kiddy authored Sep 25, 2017

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"

f4504f47

16 Sep, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 62ce3db9

Script Kiddy authored Sep 16, 2017

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"

62ce3db9

13 Sep, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 127ce16b

Script Kiddy authored Sep 13, 2017

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"

127ce16b

12 Sep, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 9d406705

Script Kiddy authored Sep 12, 2017

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"

9d406705

04 Sep, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 4be86a4b

Script Kiddy authored Sep 04, 2017

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"

4be86a4b

01 Sep, 2017 1 commit

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

Script Kiddy authored Sep 01, 2017

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"

dbb801f2

30 Aug, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 7e5e26a1

Script Kiddy authored Aug 30, 2017

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"

7e5e26a1

29 Aug, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 0f010126

Script Kiddy authored Aug 29, 2017

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"

0f010126

27 Aug, 2017 1 commit

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

Script Kiddy authored Aug 27, 2017

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"

a6731c0e

26 Aug, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 92a08d9a

Script Kiddy authored Aug 26, 2017

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"

92a08d9a

25 Aug, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 003d46e9

Script Kiddy authored Aug 25, 2017

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"

003d46e9

24 Aug, 2017 1 commit

add markdown support · 49313857

Julian Wolff authored Aug 25, 2017

Summary:
Adds support for Markdown documents

BUG: 360603

Test Plan: Open a Markdown (.md) document in Okular

Reviewers: #okular, aacid

Reviewed By: #okular, aacid

Subscribers: michaelweghorn, aacid

Tags: #okular

Differential Revision: https://phabricator.kde.org/D7382

49313857