Viewing all changes in revision 4797.2.4.
- Committer: Canonical.com Patch Queue Manager
- Date: 2010-01-21 22:17:10 UTC
- mfrom: (4981.1.6 2.1.0rc1-dev)
- mto: (4981.2.1 jam-integration) (4797.10.1 2.1) (4988.1.1 jam-integration) (4996.2.1 integration) (4999.1.1 integration) (5016.1.1 integration) (5031.1.2 merge-2.1-into-devel) (5036.1.1 integration) (4763.2.4 jam-integration) (5053.1.1 integration) (5068.1.1 integration) (5074.1.1 integration) (5080.2.1 merge-2.1-into-devel) (5110.1.1 integration) (5050.4.1 2.2) (5159.1.1 integration) (5197.1.1 merge-2.1-into-devel) (5241.2.1 trunk) (5258.1.1 diff-header-encoding) (5244.1.1 trunk) (5263.1.1 trunk) (5297.1.1 integration) (5609.33.5 2.3) (6015.55.2 2.4-feature-flags)
- mto: This revision was merged to the branch mainline in revision 4982.
- Revision ID: pqm@pqm.ubuntu.com-20100121221710-2vc21zjy3lnxbg6y
(jam) 2.1.0rc1
- files added:
- MANIFEST.in
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- contrib/debian
- 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/conflicts.txt
- bzrlib/tests/test_bencode.py => bzrlib/tests/test__bencode.py
- files modified:
- Makefile
expand all
collapse all
added
removed
