Merge branch 'school-master' into school-junior

Conflicts: branding.spec

Merge branch 'school-master' into school-junior
d6761f7e · Alexandra Panyukova · 15009ace · 542ecbce · d6761f7e · d6761f7e
Commit d6761f7e authored Oct 19, 2009 by Alexandra Panyukova
17 changed files
--- a/branding.spec
+++ b/branding.spec
@@ -24,6 +24,7 @@ BuildRequires: ImageMagick fontconfig bc libGConf-devel
 Packager: Alexandra Panyukova <mex3@altlinux.ru>
+Packager: Alexandra Panyukova <mex3@altlinux.ru>
 Source: branding.tar
 Group: Graphics

--- a/slideshow/E-shop.png
+++ b/slideshow/E-shop.png
--- a/slideshow/Education.png
+++ b/slideshow/Education.png
--- a/slideshow/Pspo.png
+++ b/slideshow/Pspo.png
--- a/slideshow/desktop_01.png
+++ b/slideshow/desktop_01.png
--- a/slideshow/desktop_02.png
+++ b/slideshow/desktop_02.png
--- a/slideshow/desktop_03.png
+++ b/slideshow/desktop_03.png
--- a/slideshow/desktop_04.png
+++ b/slideshow/desktop_04.png
--- a/slideshow/desktop_05.png
+++ b/slideshow/desktop_05.png
--- a/slideshow/desktop_06.png
+++ b/slideshow/desktop_06.png
--- a/slideshow/dsc_1758.jpg
+++ b/slideshow/dsc_1758.jpg
--- a/slideshow/dsc_3178.jpg
+++ b/slideshow/dsc_3178.jpg
--- a/slideshow/dsc_3357.jpg
+++ b/slideshow/dsc_3357.jpg
--- a/slideshow/dsc_3760.jpg
+++ b/slideshow/dsc_3760.jpg
--- a/slideshow/dsc_3801.jpg
+++ b/slideshow/dsc_3801.jpg
--- a/slideshow/dsc_3936.jpg
+++ b/slideshow/dsc_3936.jpg
--- a/slideshow/dsc_3944.jpg
+++ b/slideshow/dsc_3944.jpg