l10n daemon script
9aad886729
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"
3 years ago
l10n daemon script
8e140db62e
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"
3 years ago
l10n daemon script
14b48796ee
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"
3 years ago
l10n daemon script
2f7c77af18
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"
3 years ago
l10n daemon script
6fa6c3f20b
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"
4 years ago
l10n daemon script
cba443dbe3
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"
4 years ago
l10n daemon script
32bdf28868
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"
4 years ago
l10n daemon script
0db88c3ea6
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"
4 years ago
l10n daemon script
5317ca9da0
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"
5 years ago
l10n daemon script
f14350e1bb
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"
5 years ago
Vlad Zahorodnii
93e0265e4e
Move source code to src/ directory
...
Once in a while, we receive complaints from other fellow KDE developers
about the file organization of kwin. This change addresses some of those
complaints by moving all of source code in a separate directory, src/,
thus making the project structure more traditional. Things such as tests
are kept in their own toplevel directories.
This change may wreak havoc on merge requests that add new files to kwin,
but if a patch modifies an already existing file, git should be smart
enough to figure out that the file has been relocated.
We may potentially split the src/ directory further to make navigating
the source code easier, but hopefully this is good enough already.
5 years ago
l10n daemon script
a1c0d43deb
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"
6 years ago
l10n daemon script
f3356b1f4f
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"
6 years ago
l10n daemon script
430ca2a33e
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"
6 years ago
l10n daemon script
c10fe06d06
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"
6 years ago
l10n daemon script
da239b2006
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"
6 years ago
l10n daemon script
8027ccd6d6
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"
6 years ago
l10n daemon script
0e117c49a1
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"
6 years ago
l10n daemon script
ce5b9c3612
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"
6 years ago
l10n daemon script
f18deb69f1
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"
6 years ago
l10n daemon script
9c0a71c37f
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"
7 years ago
l10n daemon script
475af42e37
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"
9 years ago
David Edmundson
4bb12f3f01
Allow configuring script's screen edges from the KCM
...
Summary:
Modify the kwinscreenedges KCM to also list scripts which support screen
edge activation and read/write the appropriate value in the script's
config.
In order to only show relevant scripts an additional .desktop metadata
field is added.
Test Plan:
Opened KCM set a hot corner for minimize all.
Tested it
unset it, and set on another corner
Tested again
Reviewers: #plasma, graesslin
Reviewed By: #plasma, graesslin
Subscribers: graesslin, plasma-devel, kwin
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D2972
10 years ago
l10n daemon script
0990566c63
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"
10 years ago
l10n daemon script
42c594330a
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
c342be5961
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"
11 years ago
l10n daemon script
d07fd3a140
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
99237c9b3f
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"
11 years ago
l10n daemon script
bf7bf73464
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
d173ff7412
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
45b1af3165
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
91ff859d5f
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
fd8006c546
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
28c7f3c47d
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
e73f6b2278
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
7553c411c2
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
2f28437e24
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
2838a9b606
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
15aa971aab
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
e1f418f4d0
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
f44575ddbf
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
69c3289c18
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
e6db000065
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
eef56c98b2
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
fab5def5e9
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
6f8c3dd771
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
588ad2be66
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
22a5e1109f
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
3b2f744b49
SVN_SILENT made messages (.desktop file)
13 years ago
l10n daemon script
df17849412
SVN_SILENT made messages (.desktop file)
13 years ago