Andrey Cherepanov 1bd58afc26 Merge remote-tracking branch 'school-server/sisyphus' into school-server ...

Conflicts:
	branding.spec
	components.mk
	components/ahttpd/styles/alterator.css.in
	components/bootloader/gfxboot.cfg.in
	components/browser-qt/design/design.ini.in
	components/indexhtml/index.css.in
	components/indexhtml/indexhtml.desktop.in
	configure.ac
	images/boot.jpg
	images/boot.png
	images/installer.png
	images/product-logo.png
	images/wallpaper.png
	notes/index-en.html.in
	notes/index-ru.html.in
	notes/license.ru.html.in
	notes/release-notes.all.html.in
	notes/release-notes.ru.html.in

2012-04-05 16:16:48 +04:00

components

Merge remote-tracking branch 'school-server/sisyphus' into school-server

2012-04-05 16:16:48 +04:00

fvwm-settings

simple but resonable fvwm settings

2010-12-15 14:09:34 +03:00

gnome-settings

new gnome theme

2011-09-09 14:43:43 +04:00

graphics

Merge branch 'master' into alt-desktop

2009-06-25 18:45:55 +04:00

images

6.0.0-alt1

2011-11-14 14:27:58 +04:00

kde3-settings

openoffice desktop files names changed

2010-03-03 13:52:02 +03:00

kde3-styles-splash

STATUS removed. It's not beta/alpha etc. anymore

2009-10-20 17:11:08 +04:00

kde4-settings

Merge branch 'master' into alt-desktop

2009-09-09 15:38:18 +04:00

notes

Merge remote-tracking branch 'school-server/sisyphus' into school-server

2012-04-05 16:16:48 +04:00

slideshow

Merge remote-tracking branch 'school-server/sisyphus' into school-server

2012-04-05 16:16:48 +04:00

xfce-settings

spec update

2011-01-31 12:38:11 +03:00

.gear-rules

remove package name from .gear-rules

2009-05-05 12:04:07 +04:00

branding.spec

Merge remote-tracking branch 'school-server/sisyphus' into school-server

2012-04-05 16:16:48 +04:00

color_dec

misspells corrected

2009-04-03 12:45:44 +04:00

components.mk

Merge remote-tracking branch 'school-server/sisyphus' into school-server

2012-04-05 16:16:48 +04:00

configure.ac

6.0.0-alt17

2011-09-19 16:55:12 +04:00

fetch_color

colors picking from kde color scheme

2008-12-26 16:43:03 +03:00

Makefile.in

Merge remote-tracking branch 'school-server/sisyphus' into school-server

2012-04-05 16:16:48 +04:00

Description

No description provided

259 MiB