Andrey Cherepanov
0c91ca4a48
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
2013-10-14 18:43:20 +04:00
2013-08-06 12:29:48 +04:00
2013-08-05 14:03:43 +04:00
2013-02-26 15:24:02 +04:00
2013-05-29 17:19:46 +04:00
2013-05-29 17:19:46 +04:00
2009-09-28 20:03:34 +04:00
2013-08-06 12:29:48 +04:00
2013-08-05 14:03:43 +04:00
2013-05-29 17:19:46 +04:00
0c91ca4a48