harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r967070 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/modules/print/src/main/java/common/org/apache/harmony/print/internal/nls/messages.properties drlvm/ jdktools/
Date Fri, 23 Jul 2010 12:28:51 GMT
Author: hindessm
Date: Fri Jul 23 12:28:51 2010
New Revision: 967070

URL: http://svn.apache.org/viewvc?rev=967070&view=rev
Log:
Merge change from trunk@967068.

Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/modules/print/src/main/java/common/org/apache/harmony/print/internal/nls/messages.properties
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 23 12:28:51 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-967049
+/harmony/enhanced/java/trunk:929253-967068
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 23 12:28:51 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-967049
+/harmony/enhanced/java/trunk/classlib:929253-967068
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 23 12:28:51 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-967049
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-967068
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/modules/print/src/main/java/common/org/apache/harmony/print/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/print/src/main/java/common/org/apache/harmony/print/internal/nls/messages.properties?rev=967070&r1=967069&r2=967070&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/print/src/main/java/common/org/apache/harmony/print/internal/nls/messages.properties
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/print/src/main/java/common/org/apache/harmony/print/internal/nls/messages.properties
Fri Jul 23 12:28:51 2010
@@ -44,6 +44,7 @@ print.1A=Value {0} is less than 1
 print.1B=Null range
 print.1C=Lower bound {0} is less than 1
 print.1D=Null range: lowerBound > upperBound
+print.1E=Lower bound {0} is less than 0
 print.1F=Null JobStateReason
 print.20=x > y
 print.21=Valid values are: x > 0, y > 0, units >=1

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 23 12:28:51 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-967049
+/harmony/enhanced/java/trunk/drlvm:929253-967068
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 23 12:28:51 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-967049
+/harmony/enhanced/java/trunk/jdktools:929253-967068
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message