So did my best to merge trunk. All uncompiled and untested. Also, the .pot
catalogs etc. will need to be rebuilt.
--
https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelan
Sound like that is the reason then. I just tried and can't compile trunk either.
I decided to do a full manual diff, because the automated merge killed some of
my string changes. I'll do my best not to kill your bformat and ngettext Lua
functions :)
--
https://code.launchpad.net/~widelands-dev/
Feel free to push a non-compiling version that does not contain any merge
conflicts any more. I'll look into this.
as for the compiler warnings: you need gcc 4.6 or later (or clang 3) to compile
widelands since a c++11 transition I pushed to trunk recently. It made troubles
for lots of people,
3 matches
Mail list logo
