[globjects] 01/03: Merge tag 'upstream/1.1.0' into debian/experimental

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/experimental
in repository globjects.

commit 9c59da2bb6d86b86a5f9c14313160f59ecc3746d
Merge: 1ec75e3 b387b83
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Mar 21 14:34:26 2017 +0000

    Merge tag 'upstream/1.1.0' into debian/experimental
    
    Upstream version 1.1.0

 README.md                                          |  7 +-
 source/examples/computeshader/main.cpp             |  2 +-
 source/examples/qtexample/main.cpp                 |  6 +-
 source/globjects/include/globjects/AbstractState.h |  6 +-
 source/globjects/include/globjects/Buffer.h        | 31 ++++++++-
 source/globjects/include/globjects/Buffer.inl      | 25 +++++--
 source/globjects/include/globjects/StateSetting.h  |  8 ++-
 .../globjects/include/globjects/StateSetting.inl   |  2 +-
 source/globjects/source/AbstractState.cpp          | 14 ++++
 source/globjects/source/AbstractUniform.cpp        |  6 +-
 source/globjects/source/Framebuffer.cpp            |  1 +
 source/globjects/source/IncludeProcessor.cpp       |  2 +-
 source/globjects/source/IncludeProcessor.h         |  2 +-
 source/globjects/source/Program.cpp                | 48 ++++++++-----
 source/globjects/source/Shader.cpp                 |  2 +-
 source/globjects/source/State.cpp                  | 78 ++++++++++++++++------
 source/globjects/source/StateSetting.cpp           |  4 +-
 source/globjects/source/VertexArray.cpp            | 28 +++++---
 source/globjects/source/base/StringTemplate.cpp    |  2 +-
 .../source/registry/NamedStringRegistry.cpp        |  2 +-
 source/globjects/source/registry/Registry.cpp      |  2 +-
 21 files changed, 204 insertions(+), 74 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/globjects.git