l10n daemon script 4b7bac26cc 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"		2018-10-10 06:27:59 +02:00
..
ChangeLog	Move python and ruby dataengine bindings from kde-workspace	2014-01-27 19:48:08 +01:00
CMakeLists.txt	Update installation variables.	2015-01-10 17:47:31 +00:00
data_engine.rb	Move python and ruby dataengine bindings from kde-workspace	2014-01-27 19:48:08 +01:00
plasma-scriptengine-ruby-dataengine.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:27:59 +02:00