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 /Makefile.am | |
| 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 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index b44aa2d9b..9470447de 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = pyanaconda gptsync po data \ +SUBDIRS = pyanaconda po data \ tests utils scripts docs dracut widgets EXTRA_DIST = config.rpath COPYING \ |