|
| From: | David White <address@hidden> |
| Subject: | [Wesnoth-cvs-commits] resolved conflicts in game.cfg |
| Date: | Wed, 19 Nov 2003 10:39:15 -0500 |
| Commit from Sirp | 2003-11-19 10:39 EST |
resolved conflicts in game.cfg
| Module | File name | Revision | |||
|---|---|---|---|---|---|
| wesnoth | data/game.cfg | 1.9 | >>> | 1.10 | |
| wesnoth | data/scenarios/Mountain_Pass.cfg | 1.4 | >>> | 1.5 | |
| wesnoth | src/game_events.cpp | 1.8 | >>> | 1.9 | |
| wesnoth | src/image.cpp | 1.8 | >>> | 1.9 | |
| wesnoth | src/multiplayer.cpp | 1.32 | >>> | 1.33 | |
| [Prev in Thread] | Current Thread | [Next in Thread] |