~neon/ksudoku/master : changes

~neon/ksudoku/master » Changes from revision 826

From Revision 766 to 747

Rev	Summary	Authors	Tags	Date
766	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
765	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	v18.03.80	6 years ago
764	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		6 years ago
763	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		6 years ago
762	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		6 years ago
761	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		6 years ago
760	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
759	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		6 years ago
758	use of GL is optional, and on ARM platforms where GLES is us... use of GL is optional, and on ARM platforms where GLES is used it won\'t compile if marked as required	Jonathan Riddell		6 years ago
757	It's already done by kaboutdata It's already done by kaboutdata	Montel Laurent		6 years ago
756	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
755	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
754	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		6 years ago
753	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
752	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		6 years ago
751	Merge remote-tracking branch 'origin/Applications/17.04' Merge remote-tracking branch 'origin/Applications/17.04'	Luigi Toscano	v17.07.80, v17.07.90	6 years ago
750	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		6 years ago
749	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
748	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script		6 years ago
747	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