alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
732b7d82a4
plasma-framework/src/plasma/packagestructure
History
l10n daemon script 732b7d82a4 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"
2016-09-29 09:53:12 +00:00
..
CMakeLists.txt Define Plasma PackageStructure as regular KPackage PackageStructure plugins 2016-08-04 19:23:59 +02:00
containmentactions-packagestructure.json SVN_SILENT made messages (.desktop file) - always resolve ours 2016-09-29 09:53:12 +00:00
containmentactionspackage.cpp Define Plasma PackageStructure as regular KPackage PackageStructure plugins 2016-08-04 19:23:59 +02:00
dataengine-packagestructure.json SVN_SILENT made messages (.desktop file) - always resolve ours 2016-09-29 09:53:12 +00:00
dataenginepackage.cpp Define Plasma PackageStructure as regular KPackage PackageStructure plugins 2016-08-04 19:23:59 +02:00
packages_p.h Define Plasma PackageStructure as regular KPackage PackageStructure plugins 2016-08-04 19:23:59 +02:00
packages.cpp Define Plasma PackageStructure as regular KPackage PackageStructure plugins 2016-08-04 19:23:59 +02:00
plasmageneric-packagestructure.json SVN_SILENT made messages (.desktop file) - always resolve ours 2016-09-23 09:35:12 +00:00
plasmagenericpackage.cpp Define Plasma PackageStructure as regular KPackage PackageStructure plugins 2016-08-04 19:23:59 +02:00
plasmatheme-packagestructure.json SVN_SILENT made messages (.desktop file) - always resolve ours 2016-09-29 09:53:12 +00:00
plasmathemepackage.cpp Define Plasma PackageStructure as regular KPackage PackageStructure plugins 2016-08-04 19:23:59 +02:00
plasmoid-packagestructure.json SVN_SILENT made messages (.desktop file) - always resolve ours 2016-09-29 09:53:12 +00:00
plasmoidpackage.cpp Define Plasma PackageStructure as regular KPackage PackageStructure plugins 2016-08-04 19:23:59 +02:00