Merge remote-tracking branch 'school-server/sisyphus' into school-server
Conflicts:
branding.spec
components.mk
components/ahttpd/styles/alterator.css.in
components/bootloader/gfxboot.cfg.in
components/browser-qt/design/design.ini.in
components/indexhtml/index.css.in
components/indexhtml/indexhtml.desktop.in
configure.ac
images/boot.jpg
images/boot.png
images/installer.png
images/product-logo.png
images/wallpaper.png
notes/index-en.html.in
notes/index-ru.html.in
notes/license.ru.html.in
notes/release-notes.all.html.in
notes/release-notes.ru.html.in
Showing
This diff is collapsed.
Click to expand it.
259 Bytes
750 Bytes
770 Bytes
250 Bytes
861 Bytes
867 Bytes
257 Bytes
535 Bytes
400 Bytes
273 Bytes
15.2 KB
262 Bytes
259 Bytes
22.8 KB
264 Bytes
414 Bytes
This diff is collapsed.
Click to expand it.
File deleted
870 Bytes
296 Bytes
350 Bytes
File deleted
File deleted
File deleted
File deleted
1.85 KB
173 Bytes
7.37 KB
4.4 KB
4.5 KB
3.41 KB
File added
File added
File added
File added
File added
File added
178 Bytes
178 Bytes
178 Bytes
226 Bytes
518 Bytes
564 Bytes
172 Bytes
components/grub2/theme.txt
0 → 100644
components/grub2/tick.png
0 → 100644
221 Bytes
components/grub2/zero.png
0 → 100644
141 Bytes
2.94 KB
File moved
2.74 KB
1.74 KB
143 Bytes
3.53 KB
185 Bytes
2.96 KB
2.26 KB
3.85 KB
3.5 KB
43 Bytes
fvwm-settings/.fvwm2rc
0 → 100644
This diff is collapsed.
Click to expand it.
641 KB
images/background16x9.png
0 → 100644
242 KB
images/background4x3.png
0 → 100644
569 KB
images/boot.jpg
0 → 100644
78 KB
images/grub.png
0 → 100644
227 KB
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.