*** empty log message ***

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 7134f4cdf80e89ec58ad948c012cad57c7ddd8ee..8444748c437498d7d6a138365f28b76a55eccfd9 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-10  Colin Walters  <walters@verbum.org>
+
+       * Makefile.in (gamedir, gameuser): New variables.
+       (toplevel, UTILITIES): Add update-game-score.
+       (${archlibdir}): Handle HAVE_SHARED_GAME_DIR.
+
 2002-04-07  Colin Walters  <walters@verbum.org>
 
        * update-game-score.c (SCORE_FILE_PREFIX): Don't hardcode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b11d2ba269fa00b6c71597f28116e643c37efc5f..274625b4614cb7ef323dacfc067e2c39fee1a250 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2002-04-10  Colin Walters  <walters@verbum.org>
+
+       * ibuffer.el (ibuffer-canonicalize-state-list): Delete unused
+       function.
+       (ibuffer-current-buffers-with-marks): Don't call `buffer-list'
+       ourselves; take it as an argument.  Caller updated.
+       (ibuffer-mode): Make mode-class special.
+
 2002-04-10  Richard M. Stallman  <rms@gnu.org>
 
        * dired.el (dired-view-command-alist): New variable.
@@ -123,10 +131,14 @@
 
        * files.el (display-time-string): Fix last change.
 
+<<<<<<< ChangeLog
+>>>>>>> 1.3683
+=======
 2002-04-07  Sam Steingold  <sds@gnu.org>
 
        * vc-cvs.el (vc-cvs-checkin): Pass the required argument to `error'.
 
+>>>>>>> 1.3687
 2002-04-07  Jason Rumney  <jasonr@gnu.org>
 
        * international/mule-cmds.el (set-default-coding-systems)
@@ -140,6 +152,7 @@
 
        * simple.el (play-sound): Move to subr.el.
 
+>>>>>>> 1.3679
 2002-04-06  Richard M. Stallman  <rms@gnu.org>
 
        * files.el (display-time-string-forms): Mark as risky.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0b9f3d3eba4015bd97712c9d79c71c1afb6906fb..ef3df3e0ad373a52c7147c3ff79e19c8c0621769 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-10  Colin Walters  <walters@verbum.org>
+
+       * callproc.c: (Vgame_score_directory): New variable.
+       (syms_of_callproc) <Vgame_score_directory>: DEFVAR_LISP.
+
 2002-04-10  Richard M. Stallman  <rms@gnu.org>
 
        * puresize.h (BASE_PURESIZE): Reduce again to avoid big excess.