Mercurial > hg > truffle
diff make/templates/bsd-header @ 1930:2d26b0046e0d
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Tue, 30 Nov 2010 14:53:30 +0100 |
parents | b2045e0af26e |
children |
line wrap: on
line diff
--- a/make/templates/bsd-header Mon Nov 29 18:32:30 2010 +0100 +++ b/make/templates/bsd-header Tue Nov 30 14:53:30 2010 +0100 @@ -1,4 +1,4 @@ -Copyright %YEARS% Sun Microsystems, Inc. All Rights Reserved. +Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -11,7 +11,7 @@ notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - - Neither the name of Sun Microsystems nor the names of its + - Neither the name of Oracle nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.