Merge branch 'school-teacher' into school-server
Conflicts:
Makefile.in
branding.spec
components.mk
components/ahttpd/images/first-page-button.svg
components/ahttpd/images/groups/firewall.png
components/ahttpd/images/groups/network.png
components/ahttpd/images/groups/pkg.png
components/ahttpd/images/groups/system.png
components/ahttpd/images/groups/users.png
components/ahttpd/images/groups/xorg.png
components/ahttpd/images/last-page-button.svg
components/ahttpd/images/next-page-button.svg
components/ahttpd/images/prev-page-button.svg
components/ahttpd/images/steps/datetime.png
components/ahttpd/images/steps/finish.png
components/ahttpd/images/steps/greeting.png
components/ahttpd/images/steps/install.png
components/ahttpd/images/steps/install2-basesystem.png
components/ahttpd/images/steps/lilo.png
components/ahttpd/images/steps/net-eth.png
components/ahttpd/images/steps/notes-license.png
components/ahttpd/images/steps/notes-release-notes.png
components/ahttpd/images/steps/pkg-groups.png
components/ahttpd/images/steps/preinstall.png
components/ahttpd/images/steps/root.png
components/ahttpd/images/steps/sysconfig-base.png
components/ahttpd/images/steps/sysconfig-kbd.png
components/ahttpd/images/steps/sysconfig-language.png
components/ahttpd/images/steps/user.png
components/ahttpd/images/steps/users.png
components/ahttpd/images/steps/vm.png
components/ahttpd/images/steps/x11.png
components/bootloader/config.in
components/bootloader/gfxboot.cfg.in
components/browser-qt/design/design.ini.in
components/browser-qt/design/design.qss.in
components/browser-qt/theme.qrc
components/grub2/theme.txt
components/indexhtml/images/altlinux-logo.png
components/indexhtml/images/bullet.png
components/indexhtml/images/community.png
components/indexhtml/images/documentation.png
components/indexhtml/images/facebook.png
components/indexhtml/images/lines.png
components/indexhtml/images/twitter.png
components/indexhtml/images/vkontakte.png
components/indexhtml/index-en.html.in
components/indexhtml/index-ru.html.in
components/indexhtml/index.css
components/indexhtml/indexhtml.desktop.in
components/systemd/os-release.in
configure.ac
graphics/kde/kdm-logo.png
images/product-logo.png
notes/Makefile
notes/license.all.html.in
notes/license.ru.html.in
notes/release-notes.all.html.in
xfce-settings/etcskel/.config/xfce4/desktop/icons.screen0.rc
xfce-settings/etcskel/.config/xfce4/helpers.rc
xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
Showing
.gear/rules
0 → 100644
3.08 KB
812 Bytes
6.89 KB
15.2 KB
3.66 KB
1.55 KB
6.89 KB
90 Bytes
1.77 KB
2.49 KB
2.52 KB
3.97 KB
8.88 KB
2.35 KB
1.61 KB
1.62 KB
2.7 KB
2.04 KB
2.04 KB
1.65 KB
698 Bytes
698 Bytes
698 Bytes
5.68 KB
3.1 KB
1.75 KB
3.34 KB
File added
File added
File added
File added
File added
2.96 KB
6.25 KB
4 KB
graphics/icons/slinux.png
0 → 100644
4.87 KB
menu/altlinux-wine.directory
0 → 100644
menu/applications/mc.desktop
0 → 100644
notes/livecd-start.ru.html
0 → 100644
notes/livecd-start.uk.html
0 → 100644
slideshow/slides/README
0 → 100644
slideshow/slideshow.conf
0 → 100644
370 KB
xfce-settings/etcskel/.vimrc
0 → 100644
File added
File added
File added
File added