[arch-commits] Commit in subversion/repos (extra-i686)

[Douglas Soares de Andrade]

    Date: Saturday, March 21, 2009 @ 13:58:46
  Author: douglas
Revision: 30736

Try to fix extra-i686 merge conflicts

Modified:
  subversion/repos/extra-i686/	(properties)


Property changes on: subversion/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /subversion/trunk:1-27851
   + /subversion/trunk:1-30735