diff --git a/COPYING b/COPYING index 288ac6991c..9a3c44afc1 100644 --- a/COPYING +++ b/COPYING @@ -12,15 +12,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - In addition, as a special exception, the LyX Team gives permission to - link the code of this program with the XForms library (or with modified - versions of XForms that use the same license as XForms), and distribute - linked combinations including the two. You must obey the GNU General - Public License in all respects for all of the code used other than XForms. - If you modify this file, you may extend this exception to your version of - the file, but you are not obligated to do so. If you do not wish to do so, - delete this exception statement from your version. - The GNU General Public License version 2 is included below for your reference. ------------------------------------------------------------------------ diff --git a/ChangeLog b/ChangeLog index e84cbefabd..486aa656cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-01-01 Angus Leeming + + * COPYING: remove the XForms exception. + 2005-12-30 Georg Baum * configure.ac: fix version-suffix