l10n daemon script ab190aa5da 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"		2019-12-28 05:25:20 +01:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-28 05:25:20 +01:00
CMakeLists.txt	Remove outdated FindGLIB2 copy	2019-03-04 20:11:02 +01:00
Messages.sh	add Messages.sh in shell and containments	2019-11-20 12:35:14 +05:30
phonepanel.cpp	Modernize using clang-tidy	2018-12-31 04:13:55 +01:00
phonepanel.h	Modernize using clang-tidy	2018-12-31 04:13:55 +01:00