[colobot] 42/62: Merge pull request #1022 from immibis/dev

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit ee0f3ff5fd692e709fad9b4904fb0cbb51031641
Merge: 9448f67 8b0ccf6
Author: krzys_h <krzys_h at interia.pl>
Date:   Sun Oct 22 18:21:49 2017 +0200

    Merge pull request #1022 from immibis/dev
    
    Fix horizontal scrolling of planets and background images

 src/graphics/engine/engine.cpp | 19 +++++++++++++++++--
 src/graphics/engine/engine.h   | 12 +++++++++---
 src/graphics/engine/planet.cpp | 12 ++++++++++--
 3 files changed, 36 insertions(+), 7 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git