Changeset 340 in MondoRescue for trunk/mondo


Ignore:
Timestamp:
Jan 20, 2006, 1:11:02 AM (18 years ago)
Author:
bcornec
Message:

merge -r335:339 $SVN_M/branches/stable

Location:
trunk/mondo
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/VERSION

    r266 r340  
    1 2.06
     1trunk
  • trunk/mondo/configure.in

    r250 r340  
    126126AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr getline asprintf trunc vasprintf])
    127127
    128 AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/docs/Makefile mondo/docs/en/Makefile mondo/docs/en/1.6x-howto/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile mondo/xmondo/Makefile mondo/post-nuke.sample/Makefile mondo/post-nuke.sample/usr/Makefile mondo/post-nuke.sample/usr/bin/Makefile])
     128AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/docs/Makefile mondo/docs/en/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile mondo/xmondo/Makefile mondo/post-nuke.sample/Makefile mondo/post-nuke.sample/usr/Makefile mondo/post-nuke.sample/usr/bin/Makefile])
  • trunk/mondo/distributions/common/mondo.spec

    r318 r340  
    131131%files
    132132%defattr(644,root,root,755)
    133 %doc ChangeLog svn.log mondo/docs/en/1.6x-howto/*
     133%doc ChangeLog svn.log mondo/docs/en/*
    134134%doc INSTALL COPYING README TODO AUTHORS NEWS
    135135
  • trunk/mondo/mondo/docs/en/Makefile.am

    r30 r340  
    1 SUBDIRS   = 1.6x-howto
     1SUBDIRS   = mondorescue-howto
Note: See TracChangeset for help on using the changeset viewer.