all strange results of merge fixed

7cdbebd1 · Alexandra Panyukova · aa2dca4f · 7cdbebd1 · 7cdbebd1 · aa2dca4f
Commit 7cdbebd1 authored Apr 17, 2009 by Alexandra Panyukova
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

.gear-rules .gear-rules +1 -1

branding.spec branding.spec +3 -4

background.png images/background.png +0 -0

No files found.
--- a/.gear-rules
+++ b/.gear-rules
-tar: . name=branding-altlinux-desktop-@version@
+tar: . name=branding-altlinux-office-server-@version@
--- a/branding.spec
+++ b/branding.spec
-%define theme desktop
-%define Theme Desktop
-%define codename Inula Helenium
+%define theme office-server
+%define Theme Office Server
+%define codename none
 %define brand altlinux
 %define Brand ALT Linux

@@ -19,7 +19,6 @@ BuildRequires: libqt4-devel

 BuildRequires: ImageMagick fontconfig

-%define Theme Desktop
 %define status ПРОТОТИП
 %define status_en Prototype
 %define variants altlinux-office-desktop altlinux-office-server altlinux-lite

--- a/images/background.png
+++ b/images/background.png