Mercurial > hg > truffle
comparison make/windows/makefiles/vm.make @ 1930:2d26b0046e0d
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Tue, 30 Nov 2010 14:53:30 +0100 |
parents | d0753a274633 c18cbe5936b8 |
children | 06f017f7daa7 |
comparison
equal
deleted
inserted
replaced
1484:6b7001391c97 | 1930:2d26b0046e0d |
---|---|
1 # | 1 # |
2 # Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved. | 2 # Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # | 4 # |
5 # This code is free software; you can redistribute it and/or modify it | 5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as | 6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. | 7 # published by the Free Software Foundation. |
14 # | 14 # |
15 # You should have received a copy of the GNU General Public License version | 15 # You should have received a copy of the GNU General Public License version |
16 # 2 along with this work; if not, write to the Free Software Foundation, | 16 # 2 along with this work; if not, write to the Free Software Foundation, |
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
18 # | 18 # |
19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | 19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
20 # CA 95054 USA or visit www.sun.com if you need additional information or | 20 # or visit www.oracle.com if you need additional information or have any |
21 # have any questions. | 21 # questions. |
22 # | 22 # |
23 # | 23 # |
24 | 24 |
25 # Resource file containing VERSIONINFO | 25 # Resource file containing VERSIONINFO |
26 Res_Files=.\version.res | 26 Res_Files=.\version.res |