Follow-up Comment #4, patch #1264 (project freeciv):
> patch #1264 file #8303 does not coexist with patch #1263 file #8302 as they
both introduce in server/techtools.c the prototype for a (different) new
static function in the same line
I knew about this but using git it was easy to change this each time I did
merge all patches to do some test. You got me to move the line and now there
are no conflicts ;-)
(file #8411)
_______________________________________________________
Additional Item Attachment:
File name: 20100307-trunk-add-tech-upkeep.diff Size:12 KB
_______________________________________________________
Reply to this item at:
<http://gna.org/patch/?1264>
_______________________________________________
Nachricht geschickt von/durch Gna!
http://gna.org/
_______________________________________________
Freeciv-dev mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-dev
