Andrey Cherepanov 000989f5d0 Merge branch 'school-server' into school-master ... Conflicts: Makefile.in branding.spec components/ahttpd/images/groups/datetime.png components/ahttpd/images/groups/firewall.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/timezone.png components/ahttpd/styles/alterator.css.in components/bootloader/config.in components/bootloader/gfxboot.cfg.in components/browser-qt/design/design.qss.in components/indexhtml/index-en.html.in components/indexhtml/index-ru.html.in components/indexhtml/index.css components/systemd/os-release.in configure.ac gnome-settings/index.theme.in gnome-settings/metacity-theme-1.xml.in images/background16x9.png images/background4x3.png images/boot.png images/grub.png images/product-logo.png notes/index-ru.html.in slideshow/README		2013-10-16 20:47:53 +04:00
..
backgrounds	Merge branch 'school-server' into school-master	2013-10-16 20:47:53 +04:00
faces	move all from subdirectory to be more compatibnle with other brandings	2011-05-13 08:42:14 +04:00
icons	Merge branch 'school-teacher' into school-server	2013-10-14 18:43:20 +04:00
kde	6.9.9-alt1	2013-09-09 23:33:38 +04:00
kde4	- update backgrounds	2012-07-04 17:13:40 +04:00
config	- update color scheme	2012-07-04 17:12:21 +04:00