comparison LICENSE @ 435:337c45621e81

merge of 'a9b0496634cdd25647b65e585cc3240f3fa699ee' and 'c22be8b8f570b48e9662dac32c7b3e7148a42206'
author Matt Johnston <matt@ucc.asn.au>
date Thu, 22 Feb 2007 14:53:49 +0000
parents 1bfa65fed772
children 4e251543b941
comparison
equal deleted inserted replaced
434:0aaaf68e97dc 435:337c45621e81
6 The majority of code is written by Matt Johnston, under the license below. 6 The majority of code is written by Matt Johnston, under the license below.
7 7
8 Portions of the client-mode work are (c) 2004 Mihnea Stoenescu, under the 8 Portions of the client-mode work are (c) 2004 Mihnea Stoenescu, under the
9 same license: 9 same license:
10 10
11 Copyright (c) 2002-2004 Matt Johnston 11 Copyright (c) 2002-2006 Matt Johnston
12 Portions copyright (c) 2004 Mihnea Stoenescu 12 Portions copyright (c) 2004 Mihnea Stoenescu
13 All rights reserved. 13 All rights reserved.
14 14
15 Permission is hereby granted, free of charge, to any person obtaining a copy 15 Permission is hereby granted, free of charge, to any person obtaining a copy
16 of this software and associated documentation files (the "Software"), to deal 16 of this software and associated documentation files (the "Software"), to deal