diff options
| author | Chris Lumens <clumens@redhat.com> | 2012-08-03 10:35:34 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2012-08-03 10:35:34 -0400 |
| commit | 3671cc86e836990077820556387cbb416e709bbd (patch) | |
| tree | c8754fc1809bd175304f51bb11776022e9b7ec9d /anaconda.spec.in | |
| parent | ed8bf92fc65050f54463df959a9209ae43af0c54 (diff) | |
| parent | db84929284ce85a7af580738551fcc6e172cc690 (diff) | |
| download | anaconda-3671cc86e836990077820556387cbb416e709bbd.tar.gz anaconda-3671cc86e836990077820556387cbb416e709bbd.tar.xz anaconda-3671cc86e836990077820556387cbb416e709bbd.zip | |
Merge branch 'master' into newui-merge
Conflicts:
Makefile.am
anaconda
data/systemd/anaconda.target
pyanaconda/bootloader.py
pyanaconda/constants.py
pyanaconda/iutil.py
pyanaconda/kickstart.py
pyanaconda/network.py
pyanaconda/vnc.py
scripts/makeupdates
Diffstat (limited to 'anaconda.spec.in')
| -rw-r--r-- | anaconda.spec.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/anaconda.spec.in b/anaconda.spec.in index 955974fa3..6cadbc096 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -263,7 +263,6 @@ update-desktop-database &> /dev/null || : %{_sbindir}/logpicker %{_sbindir}/anaconda-cleanup-initramfs %ifarch i386 i486 i586 i686 x86_64 -%{_sbindir}/gptsync %{_sbindir}/showpart %endif %{_datadir}/anaconda |