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
This diff is collapsed.
Click to expand it.
3.99 KB
components/ahttpd/images/groups/firewall.png
100644 → 100755
3.69 KB
2.92 KB
2.86 KB
7.35 KB
2.49 KB
3.41 KB
2.52 KB
165 Bytes
3.97 KB
2.22 KB
3.46 KB
744 Bytes
344 Bytes
fvwm-settings/.fvwm2rc
0 → 100644
This diff is collapsed.
Click to expand it.
903 KB
graphics/config
0 → 100644
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
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
images/README
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
images/boot.jpg
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
images/boot.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
images/console.jpg
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
images/grub.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
images/wallpaper.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
mate-settings/Trolltech.conf
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
notes/makelink.js
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
slideshow/README
0 → 100644
This diff is collapsed.
Click to expand it.