diff options
| author | root <root@elwood.kanarip.com> | 2008-11-30 20:38:49 +0100 |
|---|---|---|
| committer | root <root@elwood.kanarip.com> | 2008-11-30 20:38:49 +0100 |
| commit | 4a4a6fff946a9582e6087677212af3e995745c46 (patch) | |
| tree | b59e6f7dc43f2aa2eccec9e9f3d4e7dad9f4f45d /Makefile.am | |
| parent | f8b542bfe8e3b3a5bc8da1080ff07dc405b5144e (diff) | |
| parent | ceb2800be84239c1474b739dc20771148d8e6766 (diff) | |
| download | spin-kickstarts-4a4a6fff946a9582e6087677212af3e995745c46.tar.gz spin-kickstarts-4a4a6fff946a9582e6087677212af3e995745c46.tar.xz spin-kickstarts-4a4a6fff946a9582e6087677212af3e995745c46.zip | |
Merge branch 'F-10'
Conflicts:
Makefile.am
configure.ac
fedora-live-base.ks
fedora-livecd-sugar.ks
spin-kickstarts.spec.in
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 2c8a794..a866761 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 |