Merge branch 'school-master' into school-junior
Conflicts:
Makefile.in
branding.spec
components.mk
components/ahttpd/images/groups/datetime.png
components/ahttpd/images/groups/mail.png
components/ahttpd/images/groups/network.png
components/ahttpd/images/groups/pkg.png
components/ahttpd/images/groups/servers.png
components/ahttpd/images/groups/system.png
components/ahttpd/images/groups/users.png
components/ahttpd/images/groups/xorg.png
components/ahttpd/images/steps/install2-preinstall.png
components/ahttpd/images/steps/packages.png
components/ahttpd/images/steps/timezone.png
components/bootloader/config.in
components/bootloader/gfxboot.cfg.in
components/browser-qt/design/design.qss.in
configure.ac
graphics/icons/altlinux_16x16.png
images/boot.png
images/console.jpg
images/installer.png
images/wallpaper.png
kde3-settings/apps/kicker/default-apps
kde3-settings/config/kcmdisplayrc
kde3-settings/config/kdeglobals.in
kde3-settings/config/konquerorrc
kde3-settings/config/kwinrc
kde4-settings/kde4/share/config/default-apps
notes/license.ru.html.in
Showing
.gear-rules
deleted
100644 → 0
3.99 KB
components/ahttpd/images/groups/firewall.png
100644 → 100755
![components/ahttpd/images/groups/firewall.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/groups/firewall.png)
3.69 KB
2.92 KB
2.86 KB
7.35 KB
2.49 KB
3.41 KB
2.52 KB
![components/ahttpd/images/steps/datetime.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/datetime.png)
165 Bytes
![components/ahttpd/images/steps/finish.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/finish.png)
![components/ahttpd/images/steps/greeting.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/greeting.png)
![components/ahttpd/images/steps/install.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/install.png)
![components/ahttpd/images/steps/install2-basesystem.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/install2-basesystem.png)
![components/ahttpd/images/steps/lilo.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/lilo.png)
![components/ahttpd/images/steps/net-eth.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/net-eth.png)
![components/ahttpd/images/steps/notes-license.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/notes-license.png)
![components/ahttpd/images/steps/notes-release-notes.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/notes-release-notes.png)
3.97 KB
![components/ahttpd/images/steps/pkg-groups.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/pkg-groups.png)
![components/ahttpd/images/steps/preinstall.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/preinstall.png)
![components/ahttpd/images/steps/root.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/root.png)
![components/ahttpd/images/steps/sysconfig-base.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/sysconfig-base.png)
![components/ahttpd/images/steps/sysconfig-kbd.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/sysconfig-kbd.png)
![components/ahttpd/images/steps/sysconfig-language.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/sysconfig-language.png)
![components/ahttpd/images/steps/user.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/user.png)
![components/ahttpd/images/steps/users.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/users.png)
![components/ahttpd/images/steps/vm.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/vm.png)
![components/ahttpd/images/steps/x11.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/ahttpd/images/steps/x11.png)
2.22 KB
![components/grub2/selected_blob_c.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/grub2/selected_blob_c.png)
![components/grub2/tick.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/grub2/tick.png)
![components/indexhtml/images/altlinux-logo.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/indexhtml/images/altlinux-logo.png)
![components/indexhtml/images/bullet.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/indexhtml/images/bullet.png)
![components/indexhtml/images/community.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/indexhtml/images/community.png)
![components/indexhtml/images/documentation.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/indexhtml/images/documentation.png)
![components/indexhtml/images/facebook.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/indexhtml/images/facebook.png)
![components/indexhtml/images/lines.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/indexhtml/images/lines.png)
3.46 KB
744 Bytes
344 Bytes
![components/indexhtml/images/twitter.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/indexhtml/images/twitter.png)
![components/indexhtml/images/vkontakte.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/components/indexhtml/images/vkontakte.png)
fvwm-settings/.fvwm2rc
0 → 100644
903 KB
graphics/config
0 → 100644
![graphics/faces/default.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/graphics/faces/default.png)
![graphics/faces/user04.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/graphics/faces/user04.png)
graphics/faces/user11.png
0 → 100644
3.03 KB
610 Bytes
5.07 KB
6.63 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
2.69 KB
5.65 KB
1008 Bytes
192 KB
1.53 KB
1.04 KB
1.68 KB
1.19 KB
1.16 KB
45 KB
4.64 KB
168 KB
8.33 KB
241 KB
9.21 KB
273 KB
5.34 KB
227 KB
20.5 KB
575 KB
15.9 KB
112 KB
images/README
0 → 100644
![images/background16x9.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/images/background16x9.png)
![images/background4x3.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/images/background4x3.png)
images/boot.jpg
deleted
100644 → 0
20.2 KB
images/boot.png
deleted
100644 → 0
174 KB
images/console.jpg
deleted
100644 → 0
3.66 KB
images/grub.png
deleted
100644 → 0
611 KB
![images/installer.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/images/installer.png)
![images/product-logo.png](https://gitum.ru/Boria/branding-etersoft-ximper/raw/147b08d012e0ef73d5376f8a3da9e6eff4d6181a/images/product-logo.png)
images/wallpaper.png
deleted
100644 → 0
370 KB
mate-settings/Trolltech.conf
0 → 100644
notes/makelink.js
0 → 100644
slideshow/README
0 → 100644