[aseprite] 28/196: Merge branch 'without-have-config-h'

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository aseprite.

commit 458fa98138b09c21464d646871b56f1369c994c7
Merge: 03951fd d33b8f7
Author: David Capello <davidcapello at gmail.com>
Date:   Thu Mar 3 19:30:32 2016 -0300

    Merge branch 'without-have-config-h'

 src/app/context_flags.h                   |  4 +++-
 src/base/CMakeLists.txt                   |  3 +++
 src/base/base.h                           |  6 +-----
 src/base/connection.h                     |  6 +++---
 src/base/ints.h                           | 19 +++++++++++++++++++
 src/base/log.cpp                          |  1 +
 src/base/log.h                            |  4 ++++
 src/base/observers.h                      |  4 +++-
 src/base/process.h                        |  4 +++-
 src/base/program_options.cpp              |  4 +++-
 src/base/serialization.h                  |  3 ++-
 src/base/sha1_rfc3174.c                   |  3 ++-
 src/cfg/cfg.cpp                           |  3 ++-
 src/config.h                              |  2 ++
 src/doc/CMakeLists.txt                    |  6 +++++-
 src/doc/algo.cpp                          |  3 ++-
 src/doc/algorithm/floodfill.cpp           |  1 +
 src/doc/algorithm/rotsprite.cpp           |  3 ++-
 src/doc/blend_funcs.cpp                   |  4 +++-
 src/doc/color.h                           |  4 +++-
 src/doc/color_scales.h                    |  3 ++-
 src/doc/context.cpp                       |  3 ++-
 src/doc/file/col_file.cpp                 |  3 ++-
 src/doc/frame_tag.cpp                     |  3 ++-
 src/doc/frame_tags.cpp                    |  3 ++-
 src/doc/handle_anidir.cpp                 |  3 ++-
 src/doc/image_io.cpp                      |  3 ++-
 src/doc/mask.cpp                          |  3 ++-
 src/doc/object.cpp                        |  3 ++-
 src/doc/object_id.h                       |  4 +++-
 src/doc/palette.cpp                       |  3 ++-
 src/doc/palette.h                         |  3 ++-
 src/doc/remap.cpp                         |  3 ++-
 src/doc/remap.h                           |  3 ++-
 src/doc/rgbmap.h                          |  3 ++-
 src/doc/site.cpp                          |  3 ++-
 src/doc/site.h                            | 10 +++++-----
 src/doc/sprite.cpp                        |  3 ++-
 src/filters/color_curve_filter.cpp        |  7 ++++---
 src/filters/convolution_matrix_filter.cpp |  3 ++-
 src/filters/replace_color_filter.cpp      |  3 ++-
 src/fixmath/fixmath.h                     |  1 +
 src/gfx/color.h                           |  4 +++-
 src/net/http_request.cpp                  |  3 ++-
 src/pen/pen_win.h                         |  2 ++
 src/render/quantization.cpp               |  3 ++-
 src/render/render.cpp                     |  3 ++-
 src/render/zoom.cpp                       |  2 ++
 src/she/common/font.h                     |  3 ++-
 src/she/skia/skia_system.h                |  1 +
 src/she/system.h                          |  3 ++-
 src/she/win/window.h                      |  1 +
 src/she/win/window_dde.cpp                |  5 +++++
 src/steam/steam.cpp                       |  1 +
 src/ui/CMakeLists.txt                     |  6 +++++-
 src/ui/accelerator.cpp                    |  1 +
 src/ui/cursor.cpp                         |  5 +++--
 src/updater/check_update.cpp              |  8 +++++++-
 src/updater/user_agent.cpp                | 14 ++++++++++++--
 59 files changed, 169 insertions(+), 59 deletions(-)

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