← Back to team overview

widelands-dev team mailing list archive

  1. widelands-dev team
  2. Mailing list archive
  3. Message #02093

Re: [Merge] lp:~widelands-dev/widelands/one_world into lp:widelands

  Thread Previous • Date Previous • • Thread Next 
One last thing: The diff against target in this merge request says 'Text conflict in src/graphic/animation.cc'. So won't be a clean merge.
-- 
https://code.launchpad.net/~widelands-dev/widelands/one_world/+merge/222708
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/one_world.

References

  Thread Previous • Date Previous • • Thread Next