1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-24 12:46:35 +01:00
falkonOfficial/src
l10n daemon script 35e160afe2 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"
2022-08-23 01:47:02 +00:00
..
lib SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-23 01:47:02 +00:00
main Stop installing app icon in pixmaps location 2021-05-16 21:14:08 +02:00
plugins SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-23 01:47:02 +00:00
scripts SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-23 01:47:02 +00:00
CMakeLists.txt Add example hellopython Python extension 2018-02-26 18:18:56 +01:00
Messages.sh Also skip scripts in src/Messages.sh 2018-03-09 09:13:10 +01:00