comparison THIRD_PARTY_README @ 946:a94714c55065

Merge
author trims
date Tue, 15 Sep 2009 20:44:24 -0700
parents a61af66fc99e
children c18cbe5936b8
comparison
equal deleted inserted replaced
0:4f5b1988dd6e 1:b4165706811b
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: