« back to all changes in this revision
Viewing changes to bzrlib/dirstate.py
- Committer: Tobias Toedter
- Date: 2007-12-30 18:52:13 UTC
- mfrom: (2438.1.708 +trunk)
- Revision ID: t.toedter@gmx.net-20071230185213-7xiqpbtshmnsf073
Merge trunk
- files added:
- bzrlib/help_topics
- bzrlib/help_topics/en
- files removed:
- doc/en/user-reference/index.txt
- 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
- files modified:
- .bzrignore
added
removed
bzrlib/dirstate.py
