comparison make/windows/build_vm_def.sh @ 15280:417e2ae45b89

Merge
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Tue, 22 Apr 2014 18:22:40 -0700
parents 4ca6dc0799b6
children 89152779163c
comparison
equal deleted inserted replaced
15279:0c6d8a08e31b 15280:417e2ae45b89
1 # 1 #
2 # Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2000, 2012, 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.