You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by ga...@apache.org on 2012/10/20 16:55:24 UTC

svn commit: r1400466 - in /xmlgraphics/commons/branches/commons-1_5/src/java/org/apache/xmlgraphics/java2d: color/profile/ColorProfileUtil.java ps/PSGraphicsConfiguration.java ps/PSGraphicsDevice.java

Author: gadams
Date: Sat Oct 20 14:55:24 2012
New Revision: 1400466

URL: http://svn.apache.org/viewvc?rev=1400466&view=rev
Log:
Remove mergeinfo that prevents clean reintegration merge.

Modified:
    xmlgraphics/commons/branches/commons-1_5/src/java/org/apache/xmlgraphics/java2d/color/profile/ColorProfileUtil.java   (props changed)
    xmlgraphics/commons/branches/commons-1_5/src/java/org/apache/xmlgraphics/java2d/ps/PSGraphicsConfiguration.java   (props changed)
    xmlgraphics/commons/branches/commons-1_5/src/java/org/apache/xmlgraphics/java2d/ps/PSGraphicsDevice.java   (props changed)

Propchange: xmlgraphics/commons/branches/commons-1_5/src/java/org/apache/xmlgraphics/java2d/color/profile/ColorProfileUtil.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/commons/branches/commons-1_5/src/java/org/apache/xmlgraphics/java2d/ps/PSGraphicsConfiguration.java
            ('svn:mergeinfo' removed)

Propchange: xmlgraphics/commons/branches/commons-1_5/src/java/org/apache/xmlgraphics/java2d/ps/PSGraphicsDevice.java
            ('svn:mergeinfo' removed)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org