To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to setup.py
- Committer: Andrew Bennetts
- Date: 2010-01-07 05:22:46 UTC
- mfrom: (4937 +trunk)
- mto: This revision was merged to the branch mainline in revision 4938.
- Revision ID: andrew.bennetts@canonical.com-20100107052246-016t0jzmc0j9g7dl
Merge lp:bzr, resolving NEWS conflict.
- files added:
- bzrlib/help_topics/es
- 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:
- NEWS
added
removed
setup.py
