From mboxrd@z Thu Jan  1 00:00:00 1970
From: shebs@sourceware.cygnus.com
To: xconq-cvs@sourceware.cygnus.com
Subject: xconq/ /ChangeLog ernel/cmd.c ernel/run.c erne ...
Date: Sun, 05 Mar 2000 07:41:00 -0000
Message-id: <20000305154154.31843.qmail@sourceware.cygnus.com>
X-SW-Source: 2000/msg00037.html
List-Id: <xconq-cvs.sourceware.org>

CVSROOT:	/cvs/xconq
Module name:	xconq
Changes by:	shebs@sourceware.cygnus.com	00/03/05 07:41:54

Modified files:
	.              : ChangeLog 
	kernel         : cmd.c run.c run2.c 
	tcltk          : tkconq.tcl tkmain.c 

Log message:
	* cmd.c (do_research): Let "research nothing" stop research.
	* run.c (units_still_acting): Don't end turn if research topic
	still needs to be chosen.
	(run_population): Add a hack for effects of "Granary".
	* run2.c (run_side_research): Skip if researchers resting.
	
	* tkconq.tcl (popup_splash_screen): Improve button names.
	(fill_in_side_list): Omit default scorekeeper text.
	(popup_research_dialog): Add "Rest" button.
	(rest_research): New proc.
	* tkmain.c (update_side_display): Move research popup to here
	from update_turn_display.
	(tk_set_side_research): Handle resting case.