[arch-commits] Commit in openjdk6/repos (extra-x86_64)

[andyrtr at archlinux.org]

    Date: Saturday, August 8, 2009 @ 13:11:43
  Author: andyrtr
Revision: 49474

Merged revisions 49472 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/openjdk6/trunk

........
  r49472 | andyrtr | 2009-08-08 17:04:51 +0000 (Sa, 08 Aug 2009) | 1 line
  
  fix svn conflict
........

Modified:
  openjdk6/repos/extra-x86_64/	(properties)


Property changes on: openjdk6/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /openjdk6/trunk:1-49209
   + /openjdk6/trunk:1-49473