← Back to branch summary

~nha/widelands/xai

~nha/widelands/xai

Viewing all changes in revision 4964.

Committer: Nicolai Hähnle
Date: 2010-02-28 12:38:54 UTC
mfrom: (4956.1.27 trunk)
Revision ID: nhaehnle@gmail.com-20100228123854-cviw62qm9tgduw02

Merge lp:widelands

files added:
cmake/Modules/FindGGZ_Core.cmake

files modified:
CMakeLists.txt

SConstruct

build/scons-tools/detect_revision.py

po/maps/maps.pot

po/scenario_atl01.wmf/scenario_atl01.wmf.pot

po/scenario_emp01.wmf/scenario_emp01.wmf.pot

po/scenario_emp02.wmf/scenario_emp02.wmf.pot

po/scenario_t01.wmf/scenario_t01.wmf.pot

po/scenario_t02.wmf/scenario_t02.wmf.pot

po/scenario_t03.wmf/scenario_t03.wmf.pot

po/texts/texts.pot

po/tribe_atlanteans/tribe_atlanteans.pot

po/tribe_barbarians/tribe_barbarians.pot

po/tribe_empire/tribe_empire.pot

po/widelands/widelands.pot

po/world_blackland/world_blackland.pot

po/world_desert/world_desert.pot

po/world_greenland/world_greenland.pot

po/world_winterland/world_winterland.pot

src/CMakeLists.txt

src/languages.h

src/logic/militarysite.cc

src/logic/player.cc

src/network/nethost.cc

Show diffs side-by-side

added added

removed removed

build/scons-tools/detect_revision.py

cmake/Modules/FindGGZ_Core.cmake

po/maps/maps.pot

po/scenario_atl01.wmf/scenario_atl01.wmf.pot

po/scenario_emp01.wmf/scenario_emp01.wmf.pot

po/scenario_emp02.wmf/scenario_emp02.wmf.pot

po/scenario_t01.wmf/scenario_t01.wmf.pot

po/scenario_t02.wmf/scenario_t02.wmf.pot

po/scenario_t03.wmf/scenario_t03.wmf.pot

po/texts/texts.pot

po/tribe_atlanteans/tribe_atlanteans.pot

po/tribe_barbarians/tribe_barbarians.pot

po/tribe_empire/tribe_empire.pot

po/widelands/widelands.pot

po/world_blackland/world_blackland.pot

po/world_desert/world_desert.pot

po/world_greenland/world_greenland.pot

po/world_winterland/world_winterland.pot

src/CMakeLists.txt

src/languages.h

src/logic/militarysite.cc

src/logic/player.cc

src/network/nethost.cc

Older »