comparison test/TEST.ROOT @ 14912:898e6a259f67

merge
author Michael Haupt <michael.haupt@oracle.com>
date Tue, 01 Apr 2014 15:15:28 +0200
parents 4ca6dc0799b6
children 89152779163c
comparison
equal deleted inserted replaced
14911:0fd2e8835ef0 14912:898e6a259f67
1 # 1 #
2 # Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2005, 2007, 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.