[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/ Property changes omitted in manual merge.

[Tres Seaver]

Log message for revision 69000:
  Property changes omitted in manual merge.

Changed:
  _U  Zope/branches/2.10/lib/python/
  _U  Zope/branches/2.10/lib/python/Zope2/

-=-

Property changes on: Zope/branches/2.10/lib/python
___________________________________________________________________
Name: svn:ignore
   - *so
*.pyc
version.txt
build

   + *so
*.pyc
version.txt
build
zope.proxy



Property changes on: Zope/branches/2.10/lib/python/Zope2
___________________________________________________________________
Name: svn:ignore
   - *so
*.pyc
build

   + *so
*.pyc
build
version.txt