Date: Tuesday, July 15, 2008 @ 21:17:46 Author: douglas Revision: 5437 Fixing the conflicts Modified: sip/repos/extra-i686/ (properties) Property changes on: sip/repos/extra-i686 ___________________________________________________________________ Name: svnmerge-integrated - /sip/trunk:1 + /sip/trunk:1-5436