Viewing all changes in revision 1417.1.4.
- Committer: Robert Collins
- Date: 2005-10-06 22:15:52 UTC
- mfrom: (1185.13.2)
- mto: This revision was merged to the branch mainline in revision 1420.
- Revision ID: robertc@robertcollins.net-20051006221552-9b15c96fa504e0ad
merge from upstream
- files removed:
- INSTALL
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- files renamed:
- bzrlib/conflicts.py => bzrlib/plugins/conflicts.py
- bzrlib/selftest/testplugins.py => bzrlib/selftest/plugins.py
- files modified:
- .rsyncexclude
- bzr *
- setup.py *
expand all
collapse all
added
removed
