Merged ^/branches/next here

This commit is contained in:
Philipp Möller
2012-04-16 08:53:21 +00:00
3963 changed files with 34609 additions and 27413 deletions
@@ -7,8 +7,8 @@
//
// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public License as
// published by the Free Software Foundation; version 2.1 of the License.
// See the file LICENSE.LGPL distributed with CGAL.
// published by the Free Software Foundation; either version 3 of the License,
// or (at your option) any later version.
//
// Licensees holding a valid commercial license may use this file in
// accordance with the commercial license agreement provided with the software.