widelands-dev team mailing list archive

[bunnybot <widelandsofficial@xxxxxxxxx>]

Bunnybot encountered an error while working on this merge proposal:

Running 'bzr merge ../_widelands_dev_widelands_listselect' failed. Output:

 M  data/i18n/fonts.lua
 M  src/editor/ui_menus/editor_main_menu_load_or_save_map.cc
 M  src/editor/ui_menus/editor_main_menu_map_options.cc
 M  src/editor/ui_menus/editor_main_menu_map_options.h
 M  src/editor/ui_menus/editor_main_menu_new_map.cc
 M  src/editor/ui_menus/editor_main_menu_random_map.cc
 M  src/editor/ui_menus/editor_main_menu_save_map_make_directory.cc
 M  src/graphic/align.cc
 M  src/graphic/font.cc
 M  src/graphic/font_handler1.cc
 M  src/graphic/font_handler1.h
 M  src/graphic/richtext.cc
 M  src/graphic/text/bidi.cc
 M  src/graphic/text/bidi.h
 M  src/graphic/text/font_set.cc
 M  src/graphic/text/font_set.h
 M  src/graphic/text/rt_render.cc
 M  src/graphic/text/rt_render.h
 M  src/graphic/text/sdl_ttf_font.cc
 M  src/graphic/text/sdl_ttf_font.h
 M  src/graphic/text/test/CMakeLists.txt
 M  src/graphic/text/test/render.cc
 M  src/graphic/text_layout.cc
 M  src/graphic/text_parser.cc
 M  src/graphic/wordwrap.cc
 M  src/ui_basic/button.cc
 M  src/ui_basic/checkbox.cc
 M  src/ui_basic/editbox.cc
 M  src/ui_basic/listselect.cc
 M  src/ui_basic/listselect.h
 M  src/ui_basic/messagebox.cc
 M  src/ui_basic/multilinetextarea.cc
 M  src/ui_basic/panel.cc
 M  src/ui_basic/progresswindow.cc
 M  src/ui_basic/slider.cc
 M  src/ui_basic/spinbox.cc
 M  src/ui_basic/table.cc
 M  src/ui_basic/textarea.cc
 M  src/ui_fsmenu/campaign_select.h
 M  src/ui_fsmenu/internet_lobby.cc
 M  src/ui_fsmenu/launch_mpg.h
 M  src/ui_fsmenu/launch_spg.h
 M  src/ui_fsmenu/load_map_or_game.cc
 M  src/ui_fsmenu/load_map_or_game.h
 M  src/ui_fsmenu/options.cc
 M  src/wui/actionconfirm.cc
 M  src/wui/building_statistics_menu.cc
 M  src/wui/game_objectives_menu.cc
 M  src/wui/login_box.cc
 M  src/wui/productionsitewindow.cc
Text conflict in src/ui_basic/table.cc
1 conflicts encountered.

-- 
https://code.launchpad.net/~widelands-dev/widelands/listselect/+merge/286033
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/listselect.