← Back to branch summary

~widelands-dev/widelands/bug1201398

~widelands-dev/widelands/bug1201398

Viewing all changes in revision 6637.

Committer: charlyghislain at gmail
Date: 2013-07-20 12:58:50 UTC
mfrom: (6626.2.17 trunk)
Revision ID: charlyghislain@gmail.com-20130720125850-sahyrgutfs0vm4zp

Merge trunk

files modified:
campaigns/tutorial01.wmf/scripting/init.lua

src/backtrace.cc

src/editor/ui_menus/editor_main_menu_load_map.cc

src/editor/ui_menus/editor_main_menu_save_map.cc

src/editor/ui_menus/editor_player_menu.cc

src/game_io/game_preload_data_packet.cc

src/graphic/font_handler.cc

src/graphic/graphic.cc

src/graphic/render/gl_surface_texture.cc

src/graphic/rendertarget.cc

src/helper.cc

src/i18n.cc

src/io/basic_fileread.h

src/io/dedicated_log.cc

src/io/filesystem/disk_filesystem.cc

src/io/filesystem/filesystem.cc

src/io/filesystem/filesystem.h

src/io/filesystem/test/test_filesystem.cc

src/logic/bob.cc

src/logic/game.cc

src/logic/game.h

src/main.cc

src/minizip/ioapi.h

src/minizip/unzip.h

src/minizip/zip.h

src/network/internet_gaming.cc

src/network/internet_gaming.h

src/network/nethost.cc

src/network/network_lan_promotion.cc

src/network/network_system.h

src/save_handler.cc

src/save_handler.h

src/scripting/lua_game.cc

src/scripting/lua_root.cc

src/scripting/lua_root.h

src/sound/sound_handler.cc

src/ui_basic/panel.cc

src/ui_basic/panel.h

src/ui_basic/progresswindow.cc

src/ui_basic/table.cc

src/ui_basic/window.cc

src/ui_basic/window.h

src/ui_fsmenu/editor_mapselect.cc

src/ui_fsmenu/launchMPG.cc

src/ui_fsmenu/mapselect.cc

src/wlapplication.cc

src/wlapplication.h

src/wui/building_ui.cc

src/wui/mapview.cc

src/wui/multiplayersetupgroup.cc

test/lua/persistence.wmf/scripting/init.lua

Show diffs side-by-side

added added

removed removed

campaigns/tutorial01.wmf/scripting/init.lua

src/backtrace.cc

src/editor/ui_menus/editor_main_menu_load_map.cc

src/editor/ui_menus/editor_main_menu_save_map.cc

src/editor/ui_menus/editor_player_menu.cc

src/game_io/game_preload_data_packet.cc

src/graphic/font_handler.cc

src/graphic/graphic.cc

src/graphic/render/gl_surface_texture.cc

src/graphic/rendertarget.cc

src/io/basic_fileread.h

src/io/dedicated_log.cc

src/io/filesystem/disk_filesystem.cc

src/io/filesystem/filesystem.cc

src/io/filesystem/filesystem.h

src/io/filesystem/test/test_filesystem.cc

src/logic/bob.cc

src/logic/game.cc

src/logic/game.h

src/minizip/ioapi.h

src/minizip/unzip.h

src/minizip/zip.h

src/network/internet_gaming.cc

src/network/internet_gaming.h

src/network/nethost.cc

src/network/network_lan_promotion.cc

src/network/network_system.h

src/save_handler.cc

src/save_handler.h

src/scripting/lua_game.cc

src/scripting/lua_root.cc

src/scripting/lua_root.h

src/sound/sound_handler.cc

src/ui_basic/panel.cc

src/ui_basic/panel.h

src/ui_basic/progresswindow.cc

src/ui_basic/table.cc

src/ui_basic/window.cc

src/ui_basic/window.h

src/ui_fsmenu/editor_mapselect.cc

src/ui_fsmenu/launchMPG.cc

src/ui_fsmenu/mapselect.cc

src/wlapplication.cc

src/wlapplication.h

src/wui/building_ui.cc

src/wui/mapview.cc

src/wui/multiplayersetupgroup.cc

test/lua/persistence.wmf/scripting/init.lua

Older »