comparison make/hotspot_distro @ 2988:513351373923

Merge
author amurillo
date Sat, 14 Jan 2012 00:47:46 -0800
parents c18cbe5936b8
children
comparison
equal deleted inserted replaced
5:dd19c42eed3f 6:1feab415aba0
1 # 1 #
2 # Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2006, 2010, 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.