Viewing all changes in revision 4797.94.3.
- Committer: Jelmer Vernooij
- Date: 2012-03-15 14:34:17 UTC
- mfrom: (5050.78.4 2.2)
- mto: (5609.48.14 2.3-feature-flags) (5050.84.1 2.2)
- mto: This revision was merged to the branch mainline in revision 6513.
- Revision ID: jelmer@samba.org-20120315143417-lrysbjaztjri7942
Merge lp:bzr/2.2.
- files added:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- bzrlib/tests/per_bzrdir_colo
- files removed:
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- bzrlib/help_topics/es
- files renamed:
- bzrlib/help_topics/es/conflicts.txt => bzrlib/help_topics/es/conflict-types.txt
- 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
