harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r966999 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/modules/portlib/src/main/native/thread/shared/hythread.c drlvm/ jdktools/
Date Fri, 23 Jul 2010 07:54:23 GMT
Author: hindessm
Date: Fri Jul 23 07:54:22 2010
New Revision: 966999

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

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/portlib/src/main/native/thread/shared/hythread.c
    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 07:54:22 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-966188,966504
+/harmony/enhanced/java/trunk:929253-966188,966504,966571
 /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 07:54:22 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-966188,966504
+/harmony/enhanced/java/trunk/classlib:929253-966188,966504,966571
 /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 07:54:22 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-966188,966504
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-966188,966504,966571
 /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/portlib/src/main/native/thread/shared/hythread.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/thread/shared/hythread.c?rev=966999&r1=966998&r2=966999&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/thread/shared/hythread.c
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/thread/shared/hythread.c
Fri Jul 23 07:54:22 2010
@@ -830,7 +830,7 @@ hythread_tls_set (hythread_t thread, hyt
  *				HYTHREAD_PRIORITY_USER_MIN<br>
  *				HYTHREAD_PRIORITY_MIN<br>
  * 
- * @returns 0 on success or negative value on failure (priority wasn't changed)
+ * @return 0 on success or negative value on failure (priority wasn't changed)
  * 
  * 
  */

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 23 07:54:22 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-966188,966504
+/harmony/enhanced/java/trunk/drlvm:929253-966188,966504,966571
 /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 07:54:22 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-966188,966504
+/harmony/enhanced/java/trunk/jdktools:929253-966188,966504,966571
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message