Viewing all changes in revision 3635.1.3.
- Committer: Robert Collins
- Date: 2008-09-02 05:28:37 UTC
- mfrom: (3675 +trunk)
- mto: This revision was merged to the branch mainline in revision 3677.
- Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.
- files added:
- bzrlib/_btree_serializer_c.pyx
- bzrlib/transport/ftp
- tools/packaging
- files removed:
- tools/win32/survey.txt
- files renamed:
- bzrlib/transport/ftp.py => bzrlib/transport/ftp/__init__.py
- doc/en/developer-guide/testing.txt => doc/developers/testing.txt
- files modified:
- .bzrignore
expand all
collapse all
added
removed
