Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/text-overlays into lp:widelands

2016-03-07 Thread GunChleoc
@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/text-overlays/+merge/287754
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/text-overlays.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-03-07 Thread GunChleoc
Thanks!

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-game_io/+merge/288172
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1395278-game_io into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-03-07 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/deprecated_error into 
lp:widelands.

Commit message:
Use -Werror=deprecated for clang compiles, so that we catch newly introduced 
ones earlier on travis. Also, fixes the one error this triggered.



Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/deprecated_error/+merge/288337
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/deprecated_error into lp:widelands.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-08 14:16:35 +
+++ CMakeLists.txt	2016-03-07 19:27:45 +
@@ -119,6 +119,7 @@
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-unreachable-code")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-documentation")
 
+  wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=deprecated")
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=non-pod-varargs")
 
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Qunused-arguments")

=== modified file 'src/editor/ui_menus/editor_help.h'
--- src/editor/ui_menus/editor_help.h	2016-02-10 14:46:32 +
+++ src/editor/ui_menus/editor_help.h	2016-03-07 19:27:45 +
@@ -45,9 +45,6 @@
 			kTree
 		};
 
-		HelpEntry(const HelpEntry& other) : HelpEntry(other.index, other.descname, other.icon) {
-		}
-
 		HelpEntry(const Widelands::DescriptionIndex init_index,
 	 const std::string& init_descname,
 	 const Image* init_icon)

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-03-07 Thread SirVer
This is ready for merging now. I would like to wait for another travis run 
though. If travis is green this can be merged. 

Since I have no internet at home for the foreseeable future, could somebody 
else merge this for me, please?
-- 
https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/beautiful_correct_lines.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-03-07 Thread bunnybot
Continuous integration builds have changed state:

Travis build 807. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/114238578.
Appveyor build 652. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_new_starting_conditions-652.
-- 
https://code.launchpad.net/~widelands-dev/widelands/new_starting_conditions/+merge/288059
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/new_starting_conditions into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-03-07 Thread bunnybot
Continuous integration builds have changed state:

Travis build 805. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/114111214.
Appveyor build 651. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1395278_game_io-651.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-game_io/+merge/288172
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1395278-game_io into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-03-07 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal:

Running 'git fetch bzr_origin' failed. Output:

fatal: 'bzr_origin' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-game_io/+merge/288172
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1395278-game_io into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-03-07 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal:

Running 'git fetch bzr_origin' failed. Output:

fatal: 'bzr_origin' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

-- 
https://code.launchpad.net/~widelands-dev/widelands/new_starting_conditions/+merge/288059
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/new_starting_conditions into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-03-07 Thread bunnybot
Bunnybot encountered an error while working on this merge proposal:

Running 'git fetch bzr_origin' failed. Output:

fatal: 'bzr_origin' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-game_io/+merge/288172
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1395278-game_io into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp