Context Navigation

← Previous Change
Next Change →

Changeset 278 for trunk/openjdk/jdk/src/windows/bin

Timestamp:

Mar 26, 2011, 8:39:20 PM (14 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b22 from branches/vendor/oracle.

Location:

Files:

: 7 edited

. (modified) (2 props)
jdk/src/windows/bin/amd64/jvm.cfg (modified) (2 diffs)
jdk/src/windows/bin/i586/jvm.cfg (modified) (2 diffs)
jdk/src/windows/bin/ia64/jvm.cfg (modified) (2 diffs)
jdk/src/windows/bin/java-rmi.c (modified) (2 diffs)
jdk/src/windows/bin/java_md.c (modified) (2 diffs)
jdk/src/windows/bin/java_md.h (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/openjdk

Property svn:ignore

old	new
1	1	build
	2	build-product-release

Property svn:mergeinfo set to
/branches/vendor/oracle/openjdk6/b22 merged eligible
/branches/vendor/oracle/openjdk6/current merged eligible

trunk/openjdk/jdk/src/windows/bin/amd64/jvm.cfg

r2	r278
2	2	#
3	3	#
4		# Copyright ~~2003-2005 Sun Microsystems, Inc. All Rights R~~eserved.
	4	# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
5	5	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
6	6	#
7	7	# This code is free software; you can redistribute it and/or modify it
8	8	# under the terms of the GNU General Public License version 2 only, as
9		# published by the Free Software Foundation. ~~Sun~~ designates this
	9	# published by the Free Software Foundation. Oracle designates this
10	10	# particular file as subject to the "Classpath" exception as provided
11		# by ~~Sun~~ in the LICENSE file that accompanied this code.
	11	# by Oracle in the LICENSE file that accompanied this code.
12	12	#
13	13	# This code is distributed in the hope that it will be useful, but WITHOUT
…	…
21	21	# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
22	22	#
23		# Please contact ~~Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,~~
24		# ~~CA 95054 USA or visit www.sun.com if you need additional information or~~
25		# ~~have any~~ questions.
	23	# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
	24	# or visit www.oracle.com if you need additional information or have any
	25	# questions.
26	26	#
27	27	#

trunk/openjdk/jdk/src/windows/bin/i586/jvm.cfg

-              r2
+              r278
 # Copyright 2001 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  Sun designates this
+# published by the Free Software Foundation.  Oracle designates this
 # particular file as subject to the "Classpath" exception as provided
 # by Sun in the LICENSE file that accompanied this code.
+# by Oracle in the LICENSE file that accompanied this code.
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 …
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
 # List of JVMs that can be used as an option to java, javac, etc.

trunk/openjdk/jdk/src/windows/bin/ia64/jvm.cfg

r2	r278
2	2	#
3	3	#
4		# Copyright ~~2002-2005 Sun Microsystems, Inc. All Rights R~~eserved.
	4	# Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
5	5	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
6	6	#
7	7	# This code is free software; you can redistribute it and/or modify it
8	8	# under the terms of the GNU General Public License version 2 only, as
9		# published by the Free Software Foundation. ~~Sun~~ designates this
	9	# published by the Free Software Foundation. Oracle designates this
10	10	# particular file as subject to the "Classpath" exception as provided
11		# by ~~Sun~~ in the LICENSE file that accompanied this code.
	11	# by Oracle in the LICENSE file that accompanied this code.
12	12	#
13	13	# This code is distributed in the hope that it will be useful, but WITHOUT
…	…
21	21	# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
22	22	#
23		# Please contact ~~Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,~~
24		# ~~CA 95054 USA or visit www.sun.com if you need additional information or~~
25		# ~~have any~~ questions.
	23	# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
	24	# or visit www.oracle.com if you need additional information or have any
	25	# questions.
26	26	#
27	27	#

trunk/openjdk/jdk/src/windows/bin/java-rmi.c

-              r2
+              r278
 /*
  * Copyright 1996 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 1996, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
  * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
 …
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */

trunk/openjdk/jdk/src/windows/bin/java_md.c

-              r167
+              r278
 /*
  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
  * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
 …
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */

trunk/openjdk/jdk/src/windows/bin/java_md.h

-              r91
+              r278
 /*
  * Copyright 1998-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
  * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
 …
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: