« back to all changes in this revision
Viewing changes to conflicts.py
- Committer: Aaron Bentley
- Date: 2005-10-04 16:52:26 UTC
- mto: This revision was merged to the branch mainline in revision 211.
- Revision ID: abentley@panoramicfeedback.com-20051004165226-05abbb66e0127c5f
Applied win32 compatibility fix from Belchenko
- files modified:
- shelf.py
added
removed
conflicts.py
