211fdfde4a
Conflicts: kcontrol/access/kcmaccess.desktop kcontrol/autostart/autostart.desktop kcontrol/colors/colors.desktop kcontrol/dateandtime/clock.desktop kcontrol/desktoppaths/desktoppath.desktop kcontrol/fonts/fonts.desktop kcontrol/hardware/joystick/joystick.desktop kcontrol/keys/keys.desktop |
||
---|---|---|
.. | ||
contents/ui | ||
metadata.desktop |