Mercurial > hg > openjdk > jigsaw > corba

changeset 445:706684c5a058

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author lana
date Fri, 12 Oct 2012 14:46:53 -0700
parents 679e8ad9874f (diff) 0e08ba7648fb (current diff)
children 23e0226a31ac 643e7612cf6d
files
diffstat 6 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Defs-bsd.gmk	Thu Oct 11 16:57:31 2012 -0700
+++ b/make/common/Defs-bsd.gmk	Fri Oct 12 14:46:53 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
--- a/make/common/internal/Resources.gmk	Thu Oct 11 16:57:31 2012 -0700
+++ b/make/common/internal/Resources.gmk	Fri Oct 12 14:46:53 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
--- a/make/common/shared/Defs-bsd.gmk	Thu Oct 11 16:57:31 2012 -0700
+++ b/make/common/shared/Defs-bsd.gmk	Fri Oct 12 14:46:53 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 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
--- a/make/common/shared/Defs-utils.gmk	Thu Oct 11 16:57:31 2012 -0700
+++ b/make/common/shared/Defs-utils.gmk	Fri Oct 12 14:46:53 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 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
--- a/make/tools/src/build/tools/stripproperties/StripPropertiesCorba.java	Thu Oct 11 16:57:31 2012 -0700
+++ b/make/tools/src/build/tools/stripproperties/StripPropertiesCorba.java	Fri Oct 12 14:46:53 2012 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
--- a/make/tools/strip_properties/Makefile	Thu Oct 11 16:57:31 2012 -0700
+++ b/make/tools/strip_properties/Makefile	Fri Oct 12 14:46:53 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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