To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4932.1.1.
- Committer: John Arbash Meinel
- Date: 2010-01-05 05:09:45 UTC
- mfrom: (4634.117.12 2.0.4-pyrex-propagation)
- mto: This revision was merged to the branch mainline in revision 4936.
- Revision ID: john@arbash-meinel.com-20100105050945-itxiesuol1op6usy
Merge the 2.0 branch, resolve one conflict.
- files added:
- bzrlib/_export_c_api.h
- bzrlib/help_topics/es
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_uifactory
- contrib/debian
- files removed:
- MANIFEST.in
- files renamed:
- 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:
- .bzrignore
expand all
collapse all
added
removed
