Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
branding-etersoft-ximper
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
branding-etersoft-ximper
Commits
f28bdfea
Commit
f28bdfea
authored
Apr 01, 2009
by
Anton V. Boyarshinov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'alt-desktop' into altlinux-office-server
Conflicts: images/logo.gif
parents
a81c5fbe
fab56a4e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
2 deletions
+5
-2
Makefile.in
Makefile.in
+1
-1
branding.spec
branding.spec
+4
-1
logo.gif
images/logo.gif
+0
-0
logo.png
images/logo.png
+0
-0
No files found.
Makefile.in
View file @
f28bdfea
...
...
@@ -19,6 +19,6 @@ all:
cp
-al
images/console.jpg
bootsplash/images/bootsplash-800x600.jpg
convert
-resize
'640x480!'
bootsplash/images/bootsplash-800x600.jpg
bootsplash/images/bootsplash-640x480.jpg
# logo for web alterator
cp
images/logo.
gif
alterator/images/
cp
images/logo.
png
alterator/images/
#color scheme
mv
kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc
"kde3-settings/apps/kdisplay/color-schemes/@BRAND_FNAME@ @NAME@.kcsrc"
branding.spec
View file @
f28bdfea
...
...
@@ -9,7 +9,7 @@
Name: branding-%brand-%theme
Version: 5.0.0
Release: alt
4
Release: alt
5
BuildArch: noarch
BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
...
...
@@ -289,6 +289,9 @@ echo $lang > lang
%_desktopdir/*
%changelog
* Wed Apr 01 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt5
- logo in www design fixed
* Tue Mar 31 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt4
- www design fixed
...
...
images/logo.gif
deleted
100644 → 0
View file @
a81c5fbe
1.22 KB
images/logo.png
0 → 100644
View file @
f28bdfea
412 Bytes
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment