Follow-up Comment #13, bug #15559 (project freeciv):

My -v2 patch (from S2_2 r17797) causes a merge conflict in server/sernet.c. I
am attaching a new -v3 patch (from S2_2 r17820) to solve the conflict.

If you already applied the -v2 patch, you might

$ patch -R < p22-plural-listen-v2.diff
$ svn up
$ patch < p22-plural-listen-v3.diff

or you might

$ svn up
$ svn revert server/sernet.c server/meta.c client/clinet.c client.servers.c
$ patch < p22-plural-listen-v3.diff

(file #9941)
    _______________________________________________________

Additional Item Attachment:

File name: p22-plural-listen-v3.diff      Size:15 KB


    _______________________________________________________

Reply to this item at:

  <http://gna.org/bugs/?15559>

_______________________________________________
  Message sent via/by Gna!
  http://gna.org/


_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to