marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
shift-shell/dialer
History
l10n daemon script 67216063fd 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"
2017-01-09 06:03:34 +01:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2017-01-09 06:03:34 +01:00
plugin [dialer] Add KPeople helper plugin 2015-07-15 21:17:35 +02:00
src SVN_SILENT made messages (.desktop file) - always resolve ours 2017-01-09 06:03:34 +01:00
CMakeLists.txt [dialer] Add KPeople helper plugin 2015-07-15 21:17:35 +02:00