[colobot] 71/145: Merge pull request #768 from melex750/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 54a34a9b22cf665a28158a9abf532f669320e11f
Merge: 952a542 e794296
Author: krzys_h <krzys_h at interia.pl>
Date:   Tue Apr 19 21:07:56 2016 +0200

    Merge pull request #768 from melex750/dev
    
    Fix function and method overloading

 src/CBot/CBotInstr/CBotFunction.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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