comparison make/windows/build_vm_def.sh @ 14803:c4219e527b83

Merge.
author Josef Eisl <josef.eisl@jku.at>
date Fri, 14 Mar 2014 17:19:52 +0100
parents d8041d695d19
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
14802:10dde0063f5a 14803:c4219e527b83
1 # 1 #
2 # Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2000, 2013, 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.