# HG changeset patch
# User vladidan
# Date 1348527655 14400
# Node ID ef7fe63a2d3958d208a3c87b55a9a68acd13818e
# Parent  04ed664b7e30a8cc0d007acda3a0856653effc1e# Parent  fac3dd92ebaf94a5b6d3ddfac52cafb9edad4974
Merge

diff -r 04ed664b7e30 -r ef7fe63a2d39 agent/make/saenv.sh
--- a/agent/make/saenv.sh	Fri Sep 21 14:39:56 2012 -0700
+++ b/agent/make/saenv.sh	Mon Sep 24 19:00:55 2012 -0400
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, 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
diff -r 04ed664b7e30 -r ef7fe63a2d39 agent/make/start-debug-server-proc.sh
--- a/agent/make/start-debug-server-proc.sh	Fri Sep 21 14:39:56 2012 -0700
+++ b/agent/make/start-debug-server-proc.sh	Mon Sep 24 19:00:55 2012 -0400
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2012, 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
diff -r 04ed664b7e30 -r ef7fe63a2d39 agent/src/share/classes/sun/jvm/hotspot/debugger/ThreadContext.java
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/ThreadContext.java	Fri Sep 21 14:39:56 2012 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/ThreadContext.java	Mon Sep 24 19:00:55 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, 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
diff -r 04ed664b7e30 -r ef7fe63a2d39 agent/src/share/classes/sun/jvm/hotspot/debugger/amd64/AMD64ThreadContext.java
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/amd64/AMD64ThreadContext.java	Fri Sep 21 14:39:56 2012 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/amd64/AMD64ThreadContext.java	Mon Sep 24 19:00:55 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, 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
diff -r 04ed664b7e30 -r ef7fe63a2d39 agent/src/share/classes/sun/jvm/hotspot/debugger/ia64/IA64ThreadContext.java
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/ia64/IA64ThreadContext.java	Fri Sep 21 14:39:56 2012 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/ia64/IA64ThreadContext.java	Mon Sep 24 19:00:55 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, 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
diff -r 04ed664b7e30 -r ef7fe63a2d39 agent/src/share/classes/sun/jvm/hotspot/debugger/sparc/SPARCThreadContext.java
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/sparc/SPARCThreadContext.java	Fri Sep 21 14:39:56 2012 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/sparc/SPARCThreadContext.java	Mon Sep 24 19:00:55 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, 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
diff -r 04ed664b7e30 -r ef7fe63a2d39 agent/src/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java	Fri Sep 21 14:39:56 2012 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java	Mon Sep 24 19:00:55 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, 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
diff -r 04ed664b7e30 -r ef7fe63a2d39 make/linux/makefiles/sa.make
--- a/make/linux/makefiles/sa.make	Fri Sep 21 14:39:56 2012 -0700
+++ b/make/linux/makefiles/sa.make	Mon Sep 24 19:00:55 2012 -0400
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, 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