Merge branch 'F-10'

Conflicts:

	Makefile.am
	configure.ac
	fedora-live-base.ks
	fedora-livecd-sugar.ks
	spin-kickstarts.spec.in
This commit is contained in:
root
2008-11-30 20:38:49 +01:00
11 changed files with 61 additions and 260 deletions

View File

@@ -3,29 +3,32 @@
kickstartdir = $(pkgdatadir)/
kickstart_DATA = \
fedora-aos.ks \
fedora-install-fedora.ks \
fedora-live-base.ks \
fedora-livecd-broffice.org.ks \
fedora-livecd-desktop.ks \
fedora-livecd-desktop-de_DE.ks \
fedora-livecd-desktop-en_US.ks \
fedora-livecd-desktop.ks \
fedora-livecd-desktop-nl_NL.ks \
fedora-livecd-desktop-pt_BR.ks \
fedora-livecd-desktop-pt_PT.ks \
fedora-livecd-education-math.ks \
fedora-livecd-electronic-lab.ks \
fedora-livecd-electronic-lab-nl_NL.ks \
fedora-livecd-electronic-lab-pt_PT.ks \
fedora-livecd-kde-de_DE.ks \
fedora-livecd-kde.ks \
fedora-livecd-kde-de_CH.ks \
fedora-livecd-kde-de_DE.ks \
fedora-livecd-kde-nl_NL.ks \
fedora-livecd-kde-pt_PT.ks \
fedora-livecd-xfce.ks \
fedora-livecd-xfce-de_CH.ks \
fedora-livecd-xfce-nl_NL.ks \
fedora-livecd-xfce-pt_PT.ks \
fedora-livedvd-developer.ks \
fedora-livedvd-developer-nl_NL.ks \
fedora-livedvd-developer-pt_PT.ks \
fedora-livedvd-electronic-lab.ks \
fedora-livedvd-electronic-lab-de_CH.ks \
fedora-livedvd-electronic-lab-nl_NL.ks \
fedora-livedvd-electronic-lab-pt_PT.ks \
fedora-livedvd-games.ks \
fedora-livedvd-games-nl_NL.ks \
fedora-livedvd-games-pt_PT.ks