Mercurial > hg > truffle
comparison src/share/vm/trace/xinclude.mod @ 11198:1e6d5dec4a4e
Merge.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Mon, 05 Aug 2013 13:20:06 +0200 |
parents | 060ae9b7ffea |
children |
comparison
equal
deleted
inserted
replaced
11197:3479ab380552 | 11198:1e6d5dec4a4e |
---|---|
1 <?xml version="1.0" encoding="UTF-8"?> | 1 <?xml version="1.0" encoding="UTF-8"?> |
2 <!-- | |
3 Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. | |
4 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | |
5 | |
6 This code is free software; you can redistribute it and/or modify it | |
7 under the terms of the GNU General Public License version 2 only, as | |
8 published by the Free Software Foundation. | |
9 | |
10 This code is distributed in the hope that it will be useful, but WITHOUT | |
11 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
12 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
13 version 2 for more details (a copy is included in the LICENSE file that | |
14 accompanied this code). | |
15 | |
16 You should have received a copy of the GNU General Public License version | |
17 2 along with this work; if not, write to the Free Software Foundation, | |
18 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
19 | |
20 Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | |
21 or visit www.oracle.com if you need additional information or have any | |
22 questions. | |
23 | |
24 --> | |
25 | |
26 <!-- | 2 <!-- |
27 Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. | 3 Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. |
28 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 4 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
29 | 5 |
30 This code is free software; you can redistribute it and/or modify it | 6 This code is free software; you can redistribute it and/or modify it |