When merging trunk here I got: Warning: criss-cross merge encountered. See bzr help criss-cross. .... Text conflict in src/ui_basic/spinbox.cc 1 conflicts encountered.
Is it safe to proceed? -- https://code.launchpad.net/~widelands-dev/widelands/bug-536409/+merge/280352 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/editor_new_map. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
