comparison THIRD_PARTY_README @ 969:0804a88ed4f5

Merge
author andrew
date Tue, 08 Sep 2009 09:02:48 +0100
parents 185d256992c3
children c18cbe5936b8
comparison
equal deleted inserted replaced
968:5fdbe2cdf565 969:0804a88ed4f5
30 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 30 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
31 USE OR OTHER DEALINGS IN THE SOFTWARE. 31 USE OR OTHER DEALINGS IN THE SOFTWARE.
32 32
33 --- end of LICENSE file --- 33 --- end of LICENSE file ---
34 %% This notice is provided with respect to ASM, which may be included with this software: 34 %% This notice is provided with respect to ASM, which may be included with this software:
35 Copyright (c) 2000-2005 INRIA, France Telecom 35 Copyright (c) 2000-2007 INRIA, France Telecom
36 All rights reserved. 36 All rights reserved.
37 37
38 Redistribution and use in source and binary forms, with or without 38 Redistribution and use in source and binary forms, with or without
39 modification, are permitted provided that the following conditions 39 modification, are permitted provided that the following conditions
40 are met: 40 are met: