[colobot] 260/377: Merge pull request #717 from Erihel/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 e647500ebff191a92c802668cb770311893be63c
Merge: b6faadc c780148
Author: krzys_h <krzys_h at interia.pl>
Date:   Thu Feb 11 18:49:11 2016 +0100

    Merge pull request #717 from Erihel/dev
    
    Fix crash related to TTF and PHYSFS

 src/CMakeLists.txt                          |  1 +
 src/common/resources/resourcemanager.cpp    |  5 ++
 src/common/resources/resourcemanager.h      |  2 +
 src/common/resources/sdl_file_wrapper.cpp   |  8 +--
 src/common/resources/sdl_memory_wrapper.cpp | 77 +++++++++++++++++++++++++++++
 src/common/resources/sdl_memory_wrapper.h   | 42 ++++++++++++++++
 src/graphics/engine/text.cpp                |  6 +--
 7 files changed, 132 insertions(+), 9 deletions(-)

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