diff options
| author | Brian C. Lane <bcl@redhat.com> | 2012-06-20 15:34:11 -0700 |
|---|---|---|
| committer | Brian C. Lane <bcl@redhat.com> | 2012-06-20 15:34:11 -0700 |
| commit | 7e1b1abc04a7dde1a4153d5e61bf0207f77d583c (patch) | |
| tree | 5a184496f757df6a61c5fd423667b94ecdb04859 /configure.ac | |
| parent | cbebb0210fba5ed5e74e01715f832d5e5929a8d5 (diff) | |
| parent | 11b3901231af7e8f57aa362873d5d18caee14386 (diff) | |
| download | anaconda-7e1b1abc04a7dde1a4153d5e61bf0207f77d583c.tar.gz anaconda-7e1b1abc04a7dde1a4153d5e61bf0207f77d583c.tar.xz anaconda-7e1b1abc04a7dde1a4153d5e61bf0207f77d583c.zip | |
Merge branch 'master' into newui-merge
Conflicts:
Makefile.am
anaconda
anaconda.spec.in
loader/loader.c
loader/net.c
loader/unpack.c
po/POTFILES.in
pyanaconda/__init__.py
pyanaconda/bootloader.py
pyanaconda/cmdline.py
pyanaconda/constants.py
pyanaconda/dispatch.py
pyanaconda/errors.py
pyanaconda/flags.py
pyanaconda/iutil.py
pyanaconda/kickstart.py
pyanaconda/platform.py
pyanaconda/storage/__init__.py
pyanaconda/storage/devicetree.py
pyanaconda/storage/fcoe.py
pyanaconda/storage/formats/swap.py
pyanaconda/storage/iscsi.py
pyanaconda/storage/partitioning.py
pyanaconda/yuminstall.py
scripts/makeupdates
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 7918554d2..b8924600e 100644 --- a/configure.ac +++ b/configure.ac @@ -20,10 +20,9 @@ m4_define(python_required_version, 2.5) AC_PREREQ([2.63]) -AC_INIT([anaconda], [17.1], [anaconda-devel-list@redhat.com]) +AC_INIT([anaconda], [18.2], [anaconda-devel-list@redhat.com]) AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2]) -AC_CONFIG_SRCDIR([loader/loader.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -259,13 +258,14 @@ AC_CONFIG_FILES([Makefile data/bootdisk/x86_64/Makefile data/command-stubs/Makefile docs/Makefile + dracut/Makefile gptsync/Makefile pyanaconda/installclasses/Makefile pyanaconda/iw/Makefile data/liveinst/Makefile data/liveinst/console.apps/Makefile + data/liveinst/gnome/Makefile data/liveinst/pam.d/Makefile - loader/Makefile data/pixmaps/Makefile data/icons/Makefile data/icons/hicolor/Makefile |