diff options
| author | Jesse Keating <jkeating@redhat.com> | 2012-08-13 16:06:05 -0700 |
|---|---|---|
| committer | Jesse Keating <jkeating@redhat.com> | 2012-08-13 16:06:05 -0700 |
| commit | 5a8b2eeca2d6c3a0ae872305508942feb6b47ec0 (patch) | |
| tree | 630ba822419772d676e124d61948153cbb45442e /configure.ac | |
| parent | 7a5776929775c3869ee912e53f4414405c52d59f (diff) | |
| parent | 168051f182baa3f00c9bdb83ba47fbf85d3ce021 (diff) | |
| download | anaconda-5a8b2eeca2d6c3a0ae872305508942feb6b47ec0.tar.gz anaconda-5a8b2eeca2d6c3a0ae872305508942feb6b47ec0.tar.xz anaconda-5a8b2eeca2d6c3a0ae872305508942feb6b47ec0.zip | |
Merge master into newtui
Conflicts:
pyanaconda/ui/gui/__init__.py
pyanaconda/ui/gui/spokes/custom.py
One last merge before pushing to master. The conflicts were due to more
development happening on those files, the result is what I hope is a
clean merge.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 530dd6778..4ed38adc6 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ m4_define(python_required_version, 2.5) AC_PREREQ([2.63]) -AC_INIT([anaconda], [18.3], [anaconda-devel-list@redhat.com]) +AC_INIT([anaconda], [18.4], [anaconda-devel-list@redhat.com]) AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2]) AC_CONFIG_HEADERS([config.h]) |