comparison LICENSE @ 837:fdf51d3f26e1 ecc

merge
author Matt Johnston <matt@ucc.asn.au>
date Sun, 20 Oct 2013 21:07:05 +0800
parents cb3cfcea1c8d
children e894dbc015ba
comparison
equal deleted inserted replaced
836:d7d9f1612d51 837:fdf51d3f26e1
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-2008 Matt Johnston 11 Copyright (c) 2002-2013 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