*** empty log message ***

lib-src/ChangeLog

+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.

lisp/ChangeLog

+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.

src/ChangeLog

+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.