Follow-up Comment #7, bug #11568 (project wesnoth): URL: http://svn.gna.org/viewcvs/wesnoth?rev=26099&view=rev Log: Cleaning formula-AI-merge ( r24256 ) Redo : r24205 r24185 r23532 r23518 r23510
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26100&view=rev Log: Cleaning formula AI merge r24256 Redo final part of r23376 boucman : skipped r23647 for the moment (you did other changes with it later) actions.cpp is normally correctly reverted, but some parts of the last changes are not very clear to me. And this code changed often in the "bad window". If someone want to take a look... (r26100) Anyways if the changes in Makefile.am are good too, I believe it's all done. Probably need a little testing now. @ shadowmaster : Not very safe, before and after the merge, trunk was compilable, just suffice that the reverted commits were not critical (and 1.5.0 is never released, so not tested a lot). But the point is also to check if we didn't lose some nice small polishing (or fix to rare bugs). _______________________________________________________ Reply to this item at: <http://gna.org/bugs/?11568> _______________________________________________ Message sent via/by Gna! http://gna.org/ _______________________________________________ Wesnoth-bugs mailing list [email protected] https://mail.gna.org/listinfo/wesnoth-bugs
