To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/util/configobj/configobj.py
- Committer: Robert Collins
- Date: 2008-04-04 00:43:07 UTC
- mfrom: (3331 +trunk)
- mto: This revision was merged to the branch mainline in revision 3333.
- Revision ID: robertc@robertcollins.net-20080404004307-0whomfhm3yal2rvw
Resolve conflicts.
- files added:
- bzrlib/directory_service.py
- doc/en/admin-guide
- files renamed:
- bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py
- bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py
- bzrlib/tests/test_revisionnamespaces.py => bzrlib/tests/test_revisionspec.py
- files modified:
- NEWS
added
removed
bzrlib/util/configobj/configobj.py
