Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Fri, 27 Mar 2009 09:30:22 +0000
changeset 553e7eb04ece02c
parent 552 56a86a363c12
parent 495 0f40b9d26049
child 556 07ed3735ce1b
Merge
LICENSE
     1.1 --- a/LICENSE	Thu Mar 19 15:41:29 2009 +0000
     1.2 +++ b/LICENSE	Fri Mar 27 09:30:22 2009 +0000
     1.3 @@ -1,10 +1,14 @@
     1.4 -LEMON code without an explicit copyright is covered by the following
     1.5 +LEMON code without an explicit copyright notice is covered by the following
     1.6  copyright/license.
     1.7  
     1.8  Copyright (C) 2003-2009 Egervary Jeno Kombinatorikus Optimalizalasi
     1.9  Kutatocsoport (Egervary Combinatorial Optimization Research Group,
    1.10  EGRES).
    1.11  
    1.12 +===========================================================================
    1.13 +Boost Software License, Version 1.0
    1.14 +===========================================================================
    1.15 +
    1.16  Permission is hereby granted, free of charge, to any person or organization
    1.17  obtaining a copy of the software and accompanying documentation covered by
    1.18  this license (the "Software") to use, reproduce, display, distribute,
    1.19 @@ -26,8 +30,3 @@
    1.20  FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
    1.21  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    1.22  DEALINGS IN THE SOFTWARE.
    1.23 -
    1.24 -===========================================================================
    1.25 -This license is a verbatim copy of the Boost Software License, Version 1.0.
    1.26 -
    1.27 -