Viewing all changes in revision 5074.5.1.
- Committer: INADA Naoki
- Date: 2010-03-03 12:14:16 UTC
- mfrom: (4634.171.4 fix-523746-2)
- mto: This revision was merged to the branch mainline in revision 5892.
- Revision ID: inada-n@klab.jp-20100303121416-uemvz4l5y1ilclv6
merge #523746 fix from lp:~songofacandy/bzr/fix-523746-2
- files added:
- .testr.conf
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_uifactory
- contrib/apport
- contrib/debian
- doc/en/whats-new
- files removed:
- bzrlib/textui.py
- files renamed:
- bzrlib/help_topics/en/conflicts.txt => bzrlib/help_topics/en/conflict-types.txt
- doc/es/user-guide/resolving_conflicts.txt => bzrlib/help_topics/es/conflict-types.txt
- bzrlib/tests/test_bencode.py => bzrlib/tests/test__bencode.py
- files modified:
- .bzrignore
expand all
collapse all
added
removed
doc/en/_static/en/bzr-en-quick-reference.svg
doc/es/_static/es/bzr-es-quick-reference.svg
doc/ru/_static/ru/bzr-ru-quick-reference.svg
