konevsa/branding-alt-virtualization-one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1bd58afc26
branding-alt-virtualization.../notes
History
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
..
index-en.html.in Merge remote-tracking branch 'school-server/sisyphus' into school-server 2012-04-05 16:16:48 +04:00
index-ru.html.in Merge remote-tracking branch 'school-server/sisyphus' into school-server 2012-04-05 16:16:48 +04:00
index-uk.html.in Merge remote-tracking branch 'school-server/sisyphus' into school-server 2012-04-05 16:16:48 +04:00
license.all.html.in STATUS removed. It's not beta/alpha etc. anymore 2009-10-21 19:57:34 +04:00
license.ru.html.in Merge remote-tracking branch 'school-server/sisyphus' into school-server 2012-04-05 16:16:48 +04:00
Makefile pink background and padding for warnings added 2009-10-01 16:51:11 +04:00
makelink.js new indexhtml 2009-09-28 20:03:34 +04:00
release-notes.all.html.in Merge remote-tracking branch 'school-server/sisyphus' into school-server 2012-04-05 16:16:48 +04:00
release-notes.ru.html.in Merge remote-tracking branch 'school-server/sisyphus' into school-server 2012-04-05 16:16:48 +04:00