[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1290073 into lp:widelands

2014-03-10 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1290073 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1290073/+merge/210188 -- https://code.launchpad.net/~widelands-dev/widelands/bug-12

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-999262 into lp:widelands

2014-03-10 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-999262 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-999262/+merge/210166 -- https://code.launchpad.net/~widelands-dev/widelands/bug-9992

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-999262 into lp:widelands

2014-03-10 Thread SirVer
pretty hacky solution, but workable for now. We have a meddle between engine and data files in more places. -- https://code.launchpad.net/~widelands-dev/widelands/bug-999262/+merge/210166 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-999262.

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1290123 into lp:widelands

2014-03-10 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1290123 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1290123/+merge/210156 -- https://code.launchpad.net/~widelands-dev/widelands/bug-12

Re: [Widelands-dev] [Merge] lp:~qcumber-some/widelands/bug1287241 into lp:~widelands-dev/widelands/debian

2014-03-10 Thread SirVer
Could it be that we are not allowed to use more than one core on the build servers? After all, canonical has to pay for them somehow. -- https://code.launchpad.net/~qcumber-some/widelands/bug1287241/+merge/209091 Your team Widelands Developers is requested to review the proposed merge of lp:~qcu

Re: [Widelands-dev] [Merge] lp:~qcumber-some/widelands/bug1287241 into lp:~widelands-dev/widelands/debian

2014-03-10 Thread Jens Beyer (Qcumber-some)
I applied the patch by Martin to the debian branch and ran the builds. While it does not seem to break anything, the builds were very slow. I can not see in the logfiles that it enables -jX for the make call. Don't know what I should make out of this... -- https://code.launchpad.net/~qcumber-som

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1290073 into lp:widelands

2014-03-10 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1290073 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1290073 in widelands: "Training grounds description vs Warrior's axe description" https://bugs.launchpad.net/widelands/+bug/1

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-999262 into lp:widelands

2014-03-10 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-999262 into lp:widelands. Requested reviews: SirVer (sirver) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-999262/+merge/210166 All resource names are now localized in "Out of resources" messages.

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1290123 into lp:widelands

2014-03-10 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1290123 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1290123 in widelands: "Delete barbarian stronghold" https://bugs.launchpad.net/widelands/+bug/1290123 For more details, see:

Re: [Widelands-dev] [Merge] lp:~qcumber-some/widelands/bug1287241 into lp:~widelands-dev/widelands/debian

2014-03-10 Thread SirVer
Thanks martin. Jens, could you apply this patch then? http://anonscm.debian.org/gitweb/?p=pkg-games/widelands.git;a=blobdiff;f=debian/rules;h=2affd4374e33bb967d8a7f355c431f271aee3efa;hp=64beaa47405397d92383bd6348b5e62a36ae1d82;hb=788f597602443038c0702fddb9fa345bfcf94484;hpb=a4e020f028c5d852d4c207