Merge branch 'default' into default-server

96078214 · Alexandra Panyukova · 2d7ef8ea · 1d3d81e9 · 96078214
Commit 96078214 authored Apr 24, 2009 by Alexandra Panyukova
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

branding.spec branding.spec +5 -1

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

 Name: branding-%brand-%theme
 Version: 5.0.0
-Release: alt14
+Release: alt15
 BuildArch: noarch

 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
@@ -343,6 +343,10 @@ echo $lang > lang
 %_desktopdir/*

 %changelog
+* Fri Apr 24 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt15
+- minor fixes of strange merge
+- changes in alterator.css.in from inger@
+
 * Fri Apr 17 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt14
 - better quality background image for installer