comparison make/windows/build_vm_def.sh @ 6858:b261523fe66c hs25-b05

Merge
author amurillo
date Fri, 12 Oct 2012 13:55:52 -0700
parents b9a9ed0f8eeb
children e522a00b91aa c062a6e1fa33
comparison
equal deleted inserted replaced
6829:0cc77f9b31ad 6858:b261523fe66c
1 # 1 #
2 # Copyright (c) 2000, 2010, 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.