Merge remote branch 'boyarsh/centaurus' into kdesktop

Conflicts: branding.spec

Merge remote branch 'boyarsh/centaurus' into kdesktop
1dd000f3 · Sergey V Turchin · 5c9a97fa · 38204ecd · 1dd000f3 · 1dd000f3
Commit 1dd000f3 authored Oct 28, 2010 by Sergey V Turchin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

branding.spec branding.spec +1 -1

gfxboot.cfg.in components/bootloader/gfxboot.cfg.in +1 -1

No files found.
--- a/branding.spec
+++ b/branding.spec
@@ -7,7 +7,7 @@

 Name: branding-%brand-kdesktop
 Version: 6.0.0
-Release: alt0.3
+Release: alt1
 BuildArch: noarch

 %define theme %name

--- a/components/bootloader/gfxboot.cfg.in
+++ b/components/bootloader/gfxboot.cfg.in
@@ -35,7 +35,7 @@ background=back.jpg
 ; max. visible main menu items
 mainmenu.entries=8
 ; minimal main menu selection bar width
-mainmenu.bar.minwidth=29
+mainmenu.bar.minwidth=294
 ; main menu selection bar transparency (0..255)
 mainmenu.bar.transparency=0
 ; main menu colors