Viewing all changes in revision 4679.6.1.
- Committer: John Arbash Meinel
- Date: 2009-10-08 05:12:01 UTC
- mfrom: (4679.3.86 2.1-simple-set)
- mto: (4679.5.2 2.1-static-tuple-no-use)
- mto: This revision was merged to the branch mainline in revision 4736.
- Revision ID: john@arbash-meinel.com-20091008051201-1gymsfisg2t9se0g
Merge the 2.1-simple-set branch
But revert the changes to bzrlib/_btree_serializer_pyx.pyx that didn't end up in that branch.
And restore the export and import headers.
But revert the changes to bzrlib/_btree_serializer_pyx.pyx that didn't end up in that branch.
And restore the export and import headers.
- files removed:
- bzrlib/_static_tuple_c.c
- files modified:
- bzrlib/_btree_serializer_pyx.pyx
expand all
collapse all
added
removed
