[opencity] 88/91: Merge tag 'upstream/0.0.6.4stable'

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository opencity.

commit 380bc82ff3b7baeeb13a3d8297fcf4971ea84d5d
Merge: e69fae7 56c65bf
Author: Markus Koschany <apo at gambaru.de>
Date:   Wed Mar 25 13:07:46 2015 +0100

    Merge tag 'upstream/0.0.6.4stable'
    
    Upstream version 0.0.6.4stable
    
    # gpg: Signature made Wed 25 Mar 2015 13:07:43 CET using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]

 Makefile.in                 |  2 +-
 README                      |  2 +-
 TODO                        |  2 +-
 configure                   | 57 ++++++++++++++++++++++++++++-----------------
 configure.ac                | 46 +++++++++++++++++++++++++-----------
 src/extensionmanager.cpp    | 12 +++++++++-
 src/globalvar.h             |  4 ++--
 src/main.cpp                |  2 +-
 src/main.h                  |  2 +-
 src/model/ac3dmaterial.cpp  |  2 +-
 src/model/ac3dobject.cpp    |  2 +-
 src/model/ac3dsurface.cpp   |  2 +-
 src/pathfinder.cpp          | 10 ++++++--
 src/propertymanager.cpp     | 18 +++++++-------
 src/structure/structure.cpp |  8 +++----
 15 files changed, 110 insertions(+), 61 deletions(-)

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