« back to all changes in this revision
Viewing changes to bzrlib/python-compat.h
- Committer: Andrew Bennetts
- Date: 2009-06-09 03:14:05 UTC
- mfrom: (4416 +trunk)
- mto: This revision was merged to the branch mainline in revision 4420.
- Revision ID: andrew.bennetts@canonical.com-20090609031405-wak9yogzzpx9o172
Merge bzr.dev, resolving NEWS conflict.
- files added:
- bzrlib/_bencode_pyx.h
- files removed:
- bzrlib/util/tests/test_bencode.py
- files renamed:
- bzrlib/tests/workingtree_implementations/test_get_file_with_stat.py => bzrlib/tests/tree_implementations/test_get_file_with_stat.py
- bzrlib/util/bencode.py => bzrlib/util/_bencode_py.py
- files modified:
- .bzrignore
added
removed
bzrlib/python-compat.h
