Merge remote-tracking branch 'boyarsh/centaurus' into kdesktop
Conflicts:
branding.spec
components/browser-qt/design/design.ini.in
components/browser-qt/design/design.qss.in
components/indexhtml/index-en.html.in
components/indexhtml/index-uk.html.in
components/indexhtml/index.css.in
Showing
2.94 KB
File moved
2.74 KB
1.74 KB
143 Bytes
3.53 KB
2.96 KB
2.26 KB
3.85 KB
3.5 KB
43 Bytes