comparison LICENSE @ 835:4095b6d7c9fc ecc

Merge in changes from the past couple of releases
author Matt Johnston <matt@ucc.asn.au>
date Fri, 18 Oct 2013 21:38:01 +0800
parents cb3cfcea1c8d
children e894dbc015ba
comparison
equal deleted inserted replaced
807:75509065db53 835:4095b6d7c9fc
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