Changeset 553:e7eb04ece02c in lemon-main

Timestamp:

03/27/09 10:30:22 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

552:56a86a363c12 (diff), 506:0f40b9d26049 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge

Files:

• LICENSE (modified) (1 diff)
• LICENSE (modified) (3 diffs)

LICENSE

@@ -2 +2 @@
 copyright/license.
 
-Copyright (C) 2003-2008 Egervary Jeno Kombinatorikus Optimalizalasi
+Copyright (C) 2003-2009 Egervary Jeno Kombinatorikus Optimalizalasi
 Kutatocsoport (Egervary Combinatorial Optimization Research Group,
 EGRES).

LICENSE

@@ -1 @@
-LEMON code without an explicit copyright is covered by the following
+LEMON code without an explicit copyright notice is covered by the following
 copyright/license.
 
@@ -5 +5 @@
 Kutatocsoport (Egervary Combinatorial Optimization Research Group,
 EGRES).
+
+===========================================================================
+Boost Software License, Version 1.0
+===========================================================================
 
 Permission is hereby granted, free of charge, to any person or organization
@@ -27 +31 @@
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
-
-===========================================================================
-This license is a verbatim copy of the Boost Software License, Version 1.0.
-
-