Viewing all changes in revision 5552.1.3.
- Committer: Vincent Ladeuil
- Date: 2010-12-02 10:41:05 UTC
- mfrom: (5050.45.20 583667-lp-no-edge-2.2)
- mto: (5554.1.2 trunk)
- mto: This revision was merged to the branch mainline in revision 5555.
- Revision ID: v.ladeuil+lp@free.fr-20101202104105-ga8yt8u3ur3u407t
Merge 2.2 into 2.3 including fixes for bug #583667 and bug #681885
- files added:
- bzrlib/tests/per_tree/test_is_executable.py
- files modified:
- bzrlib/_patiencediff_c.c
expand all
collapse all
added
removed
