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

@@ -6,13 +6,6 @@ ALL_LINGUAS="bn_IN bn ca cs da de el es fi fr gl gu hi hr hu is it ja ko ml ms n
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
#dnl prevent to copy po/Makefile.in.in
#GETTEXT_PACKAGE=revisor
#AC_SUBST(GETTEXT_PACKAGE)
#AM_GLIB_GNU_GETTEXT
#AC_PROG_INTLTOOL
#AC_PROG_LN_S
AC_SUBST(DATESTAMP,`date +"%a %b %d %Y"`)
AC_CONFIG_FILES([