« back to all changes in this revision
Viewing changes to tools/
- Committer: Robert Collins
- Date: 2008-02-13 03:30:01 UTC
- mfrom: (3221 +trunk)
- mto: This revision was merged to the branch mainline in revision 3224.
- Revision ID: robertc@robertcollins.net-20080213033001-rw70ul0zb02ph856
Merge to fix conflicts.
- files added:
- bzrlib/help_topics
- bzrlib/help_topics/en
- doc/en/tutorials
- doc/en/user-guide/images
- files removed:
- bzrlib/plugins/multiparent.py
- files renamed:
- bzrlib/help_topics.py => bzrlib/help_topics/__init__.py
- doc/en/user-guide/authentication_conf.txt => bzrlib/help_topics/en/authentication.txt
- doc/en/user-guide/configuration.txt => bzrlib/help_topics/en/configuration.txt
- doc/en/user-guide/conflicts.txt => bzrlib/help_topics/en/conflicts.txt
- doc/en/user-reference/hooks.txt => bzrlib/help_topics/en/hooks.txt
- bzrlib/tests/HttpServer.py => bzrlib/tests/http_server.py
- bzrlib/tests/HTTPTestUtil.py => bzrlib/tests/http_utils.py
- doc/developers/knitpack.txt => doc/developers/packrepo.txt
- doc/en/user-guide/centralized_workflow.txt => doc/en/tutorials/centralized_workflow.txt
- doc/en/user-guide/tutorial.txt => doc/en/tutorials/tutorial.txt
- files modified:
- .bzrignore
added
removed
tools/
