~neon/kdesdk-kioslaves/master : changes

~neon/kdesdk-kioslaves/master » Changes from revision 561

From Revision 466 to 447

Rev	Summary	Authors	Tags	Date
466	Initial port to Frameworks 5 Initial port to Frameworks 5 A bit of help from kde-dev-scripts/kf5, and experience from other kioslaves.	Luigi Toscano		7 years ago
465	Remove svn kioslave Remove svn kioslave It doesn't build and kdesvn has a kioslave that actually compiles and works	Albert Astals Cid		7 years ago
464	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	v16.11.80, v16.11.90, v16.12.0, v16.12.1	7 years ago
463	make svn kioslave optional make svn kioslave optional Mostly in order to be able to easily disable it, since it currently fails to build against subversion-1.9+	Rex Dieter	v16.03.80, v16.03.90, v16.04.1, v16.04.2, v16.04.3, v16.08.0, v16.08.1, v16.08.2, v16.08.3	8 years ago
462	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	v15.11.80, v15.11.90, v15.12.1, v15.12.3	8 years ago
461	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	v15.07.90, v15.08.2	8 years ago
460	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		9 years ago
459	SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file)	l10n daemon script	v15.03.80, v15.04.0	9 years ago
458	SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file)	l10n daemon script	v14.11.95	9 years ago
457	SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file)	l10n daemon script		9 years ago
456	SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file)	l10n daemon script	v4.12.80, v4.12.90, v4.12.95, v4.12.97, v4.13.80, v4.13.95, v4.14.1, v4.14.2	10 years ago
455	SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file)	l10n daemon script		10 years ago
454	SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file)	l10n daemon script		10 years ago
453	SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file)	l10n daemon script		10 years ago
452	SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file)	l10n daemon script		10 years ago
451	SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file)	l10n daemon script		10 years ago
450	SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file)	l10n daemon script		10 years ago
449	SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file)	Script Kiddy	v4.10.90	11 years ago
448	SVN_SILENT made messages (.desktop file) SVN_SILENT made messages (.desktop file)	Script Kiddy		11 years ago
447	Merge remote-tracking branch 'origin/KDE/4.10' Merge remote-tracking branch 'origin/KDE/4.10'	Pino Toscano		11 years ago