diff src/ChangeLog @ 82140:b98604865ea0

Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 70-73) - Update from CVS 2007-07-25 Glenn Morris <rgm@gnu.org> * Relicense all FSF files to GPLv3 or later. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
author Miles Bader <miles@gnu.org>
date Thu, 26 Jul 2007 05:28:10 +0000
parents dd8905ab6eaa 343cdd26063b
children ddc94a290eea f55f9811f5d7
line wrap: on
line diff
--- a/src/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/src/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -1,3 +1,9 @@
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+	* Relicense all FSF files to GPLv3 or later.
+
+	* COPYING: Switch to GPLv3.
+
 2007-07-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* eval.c (Fcommandp): Pay attention to the `interactive-form' property.
@@ -8,6 +14,15 @@
 	* data.c (Finteractive_form): Use an `interactive-form' property if
 	present, analogous to the function-documentation property.
 
+2007-07-24  Jason Rumney  <jasonr@gnu.org>
+
+	* w32fns.c (x_real_positions): Get real position from OS instead of
+	calculating it.
+
+2007-07-23  Jason Rumney  <jasonr@gnu.org>
+
+	* filelock.c (current_lock_owner): Allow for @ sign in username.
+
 2007-07-22  Nick Roberts  <nickrob@snap.net.nz>
 
 	* xdisp.c (decode_mode_spec): Add case 'R' for to test for
@@ -28726,7 +28741,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,