Reduce scope of variable
Check emptiness using empty
Reduce scope of variable
Merge pull request #1129 from hansjoachim/cppcheck-fixes

Cppcheck fixes
Regenerates the translation templates and updated the Galician (gl) translation
Do not override environment compiler flags
Merge pull request #1133 from Ablu/fedora_packaging_for_upstream

Do not override environment compiler flags
Remove unused code for partial background rendering

Once upon a time we had an 'optimisation' to render the background
only when needed.

There was still some cruft left, which is removed in this commit.

Fixes #1135
Merge pull request #1136 from stefanbeller/master

Remove unused code for partial background rendering
Properly handle merge stacks in equipment inventory

Fixes #1137
Merge pull request #1138 from dorkster/fixes

Properly handle merge stacks in equipment inventory
Merge pull request #1132 from Gallaecio/gl

Regenerates the translation templates and updated the Galician (gl) tran...
Merge remote-tracking branch 'upstream/master'