07a7bceee3
Conflicts: Makefile.in branding.spec components.mk components/ahttpd/images/groups/datetime.png components/ahttpd/images/groups/mail.png components/ahttpd/images/groups/network.png components/ahttpd/images/groups/pkg.png components/ahttpd/images/groups/servers.png components/ahttpd/images/groups/system.png components/ahttpd/images/groups/users.png components/ahttpd/images/groups/xorg.png components/ahttpd/images/steps/install2-preinstall.png components/ahttpd/images/steps/packages.png components/ahttpd/images/steps/timezone.png components/bootloader/config.in components/bootloader/gfxboot.cfg.in components/browser-qt/design/design.qss.in configure.ac graphics/icons/altlinux_16x16.png images/boot.png images/console.jpg images/installer.png images/wallpaper.png kde3-settings/apps/kicker/default-apps kde3-settings/config/kcmdisplayrc kde3-settings/config/kdeglobals.in kde3-settings/config/konquerorrc kde3-settings/config/kwinrc kde4-settings/kde4/share/config/default-apps notes/license.ru.html.in |
||
|---|---|---|
| .. | ||
| ahttpd | ||
| bootloader | ||
| bootsplash | ||
| browser-qt | ||
| grub2 | ||
| indexhtml | ||
| systemd | ||