From c8aad8f9979903796eaa49fb974be89fcc124e5f Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 16 Jan 2012 14:47:16 +0000 Subject: [PATCH] Fix last occurrences of QPL or 'Q Public License' in next. --- Developers_manual/doc_tex/Developers_manual/tools.tex | 2 +- Installation/README | 1 - wininst/developer_scripts/script_cgal.nsi | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Developers_manual/doc_tex/Developers_manual/tools.tex b/Developers_manual/doc_tex/Developers_manual/tools.tex index 62338a00c34..1b2191bde47 100644 --- a/Developers_manual/doc_tex/Developers_manual/tools.tex +++ b/Developers_manual/doc_tex/Developers_manual/tools.tex @@ -843,7 +843,7 @@ looking for a fixed string. Additionally, there might be provisions in the top-level LICENSE file that are not taken into account by this script. Note that there might be license errors that are not detected by this script. -For example, we do not check that files under LGPL and QPL are not mixed in +For example, we do not check that files under LGPL and GPL are not mixed in one library. \index{check_licenses script@{\tt check\_licenses} script|)} diff --git a/Installation/README b/Installation/README index cdce20f9103..cd6af6a22d2 100644 --- a/Installation/README +++ b/Installation/README @@ -11,7 +11,6 @@ This distribution of CGAL includes: LICENSE.FREE_USE - text of the free use license (see LICENSE file) LICENSE.GPL - text of GPL v3 license LICENSE.LGPL - text of LGPL v3 license - LICENSE.QPL - text of the QPL v1.0 license README - this file VERSION - version number of this release auxiliary/ - directory containing miscellaneous things, currently only diff --git a/wininst/developer_scripts/script_cgal.nsi b/wininst/developer_scripts/script_cgal.nsi index ebc4b563583..ac648b3eda3 100644 --- a/wininst/developer_scripts/script_cgal.nsi +++ b/wininst/developer_scripts/script_cgal.nsi @@ -170,7 +170,7 @@ Section "!Main CGAL" MAIN_Idx File "${CGAL_SRC}\LICENSE" File "${CGAL_SRC}\LICENSE.FREE_USE" File "${CGAL_SRC}\LICENSE.LGPL" - File "${CGAL_SRC}\LICENSE.QPL" + File "${CGAL_SRC}\LICENSE.GPL" File "${CGAL_SRC}\VERSION" File ".\cgal.ico" !endif