Files · 3effbee764bd578eee403e6c7add5f2a97303ae9 · Ximper Linux / branding-etersoft-ximper · GitLab

History Find file

Merge branch 'master' into office-server · 3effbee7
Stanislav Ievlev authored Sep 18, 2009
```
Conflicts:
	components.mk
	components/ahttpd/styles/alterator.css.in
	images/logo.png
```
3effbee7

Name	Last commit	Last update
components		Loading commit data...
gnome-settings		Loading commit data...
graphics		Loading commit data...
images		Loading commit data...
kde3-settings		Loading commit data...
kde3-styles-splash		Loading commit data...
kde4-settings		Loading commit data...
notes		Loading commit data...
slideshow		Loading commit data...
xfce-settings		Loading commit data...
.gear-rules		Loading commit data...
Makefile.in		Loading commit data...
branding.spec		Loading commit data...
color_dec		Loading commit data...
components.mk		Loading commit data...
configure.ac		Loading commit data...
fetch_color		Loading commit data...