Mercurial > hg > truffle
comparison 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 |
comparison
equal
deleted
inserted
replaced
1484:6b7001391c97 | 1930:2d26b0046e0d |
---|---|
1 Copyright %YEARS% Sun Microsystems, Inc. All Rights Reserved. | 1 Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved. |
2 | 2 |
3 Redistribution and use in source and binary forms, with or without | 3 Redistribution and use in source and binary forms, with or without |
4 modification, are permitted provided that the following conditions | 4 modification, are permitted provided that the following conditions |
5 are met: | 5 are met: |
6 | 6 |
9 | 9 |
10 - Redistributions in binary form must reproduce the above copyright | 10 - Redistributions in binary form must reproduce the above copyright |
11 notice, this list of conditions and the following disclaimer in the | 11 notice, this list of conditions and the following disclaimer in the |
12 documentation and/or other materials provided with the distribution. | 12 documentation and/or other materials provided with the distribution. |
13 | 13 |
14 - Neither the name of Sun Microsystems nor the names of its | 14 - Neither the name of Oracle nor the names of its |
15 contributors may be used to endorse or promote products derived | 15 contributors may be used to endorse or promote products derived |
16 from this software without specific prior written permission. | 16 from this software without specific prior written permission. |
17 | 17 |
18 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS | 18 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS |
19 IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | 19 IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, |