Andrey Cherepanov 02b9f5b37e Merge remote-tracking branch 'zerg-school-master/sisyphus' into school-master ...

Conflicts:
	Makefile.in
	branding.spec
	components.mk
	components/ahttpd/images/groups/firewall.png
	components/indexhtml/index-ru.html.in
	components/indexhtml/indexhtml.desktop.in
	images/installer.png
	notes/index-ru.html.in
	notes/license.ru.html.in
	notes/release-notes.all.html.in
	notes/release-notes.ru.html.in

2013-09-06 09:22:04 +04:00

..

ahttpd

Merge remote-tracking branch 'zerg-school-master/sisyphus' into school-master

2013-09-06 09:22:04 +04:00

bootloader

Merge remote-tracking branch 'zerg-school-master/sisyphus' into school-master

2013-09-06 09:22:04 +04:00

bootsplash

- update bootsplash theme

2012-07-05 16:38:21 +04:00

browser-qt

- fix path to logo

2012-07-05 15:43:25 +04:00

grub2

- fix colors

2012-07-30 18:02:50 +04:00

indexhtml

Merge remote-tracking branch 'zerg-school-master/sisyphus' into school-master

2013-09-06 09:22:04 +04:00