~telepathy-kde/telepathy-kde/ktp-text-ui : changes

~telepathy-kde/telepathy-kde/ktp-text-ui » Changes from revision 1492

From Revision 1464 to 1445

Rev	Summary	Authors	Date
1464	Merge branch 'Applications/18.04' Merge branch 'Applications/18.04'	David Edmundson	6 years ago
1463	Merge branch 'Applications/18.04' Merge branch 'Applications/18.04'	David Edmundson	6 years ago
1462	Fix with Qt 5.11 Fix with Qt 5.11 Reviewed-by: David Edmundson	Eugene Shalygin	6 years ago
1461	GIT_SILENT Upgrade KDE Applications version to 18.07.70. GIT_SILENT Upgrade KDE Applications version to 18.07.70.	Albert Astals Cid	6 years ago
1460	Remove obsolete reviewboardrc file Remove obsolete reviewboardrc file	Laurent Montel	6 years ago
1459	SVN_SILENT made messages (.desktop file) - always resolve ou... 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	6 years ago
1458	SVN_SILENT made messages (.desktop file) - always resolve ou... 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	6 years ago
1457	GIT_SILENT Upgrade KDE Applications version to 18.03.70. GIT_SILENT Upgrade KDE Applications version to 18.03.70.	Albert Astals Cid	6 years ago
1456	SVN_SILENT made messages (.desktop file) - always resolve ou... 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	6 years ago
1455	SVN_SILENT made messages (.desktop file) - always resolve ou... 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	6 years ago
1454	SVN_SILENT made messages (.desktop file) - always resolve ou... 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	6 years ago
1453	SVN_SILENT made messages (.desktop file) - always resolve ou... 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	6 years ago
1452	SVN_SILENT made messages (.desktop file) - always resolve ou... 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	6 years ago
1451	SVN_SILENT made messages (.desktop file) - always resolve ou... 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	6 years ago
1450	GIT_SILENT Upgrade KDE Applications version to 17.11.70. GIT_SILENT Upgrade KDE Applications version to 17.11.70.	Albert Astals Cid	6 years ago
1449	Merge remote-tracking branch 'origin/Applications/17.04' Merge remote-tracking branch 'origin/Applications/17.04'	Luigi Toscano	6 years ago
1448	SVN_SILENT made messages (.desktop file) - always resolve ou... 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	6 years ago
1447	SVN_SILENT made messages (.desktop file) - always resolve ou... 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	6 years ago
1446	SVN_SILENT made messages (.desktop file) - always resolve ou... 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	7 years ago
1445	Fix missing icon: mail-encrypt->mail-encrypted. Fix missing icon: mail-encrypt->mail-encrypted.	Andrius Štikonas	7 years ago