Merge remote branch 'cas/school-master' into school-master
Conflicts:
branding.spec
images/boot.jpg
kde4-settings/menu/desktop.menu
notes/release-notes.ru.html.in
Showing
This diff is collapsed.
Click to expand it.
![graphics/faces/default.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/052e005589dcfcf1d5742e03e782a337e4e7f98a/graphics/faces/default.png)
![graphics/faces/user04.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/052e005589dcfcf1d5742e03e782a337e4e7f98a/graphics/faces/user04.png)
graphics/faces/user11.png
0 → 100644
3.03 KB
graphics/icons/altlinux.png
0 → 120000
2.12 KB
File moved
5.07 KB
6.63 KB
3.59 KB
6.01 KB
3.5 KB
3.81 KB
3.04 KB
118 KB
2.09 KB
2.24 KB
16.5 KB
13.4 KB
8.82 KB
2.11 KB
13.7 KB
38.4 KB
20.1 KB
5.34 KB
15.2 KB
108 KB
4.74 KB
5.65 KB
2.43 KB
1.5 KB
227 KB
1.66 KB
1.56 KB
1.91 KB
1.86 KB
2.49 KB
1.62 KB
57.8 KB
4.64 KB
8.33 KB
9.21 KB
5.34 KB
20.5 KB
27.3 KB
112 KB
![images/boot.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/052e005589dcfcf1d5742e03e782a337e4e7f98a/images/boot.png)
slideshow/dsc_1758.jpg
0 → 100644
53.4 KB
slideshow/dsc_3178.jpg
0 → 100644
37.3 KB
slideshow/dsc_3357.jpg
0 → 100644
77 KB
slideshow/dsc_3760.jpg
0 → 100644
61.1 KB
slideshow/dsc_3801.jpg
0 → 100644
65.3 KB
slideshow/dsc_3936.jpg
0 → 100644
40 KB
slideshow/dsc_3944.jpg
0 → 100644
59.6 KB