2 commits

Author	SHA1	Message	Date
l10n daemon script	38a5933249	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-15 09:48:16 +00:00
Martin Gräßlin	33dffc0fd7	Move the x11 plugin sources into a x11/windowed directory ... Preparation step for having two x11 backends: the windowed for Wayland and a standalone for kwin_x11.	2016-04-12 08:04:16 +02:00

Renamed from plugins/platforms/x11/x11.json (Browse further)