[planetblupi] 13/15: record new upstream branch and merge it

[Didier Raboud]

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

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 9833e9d1303ab5d8f4d3802e942d7367afa62c34
Merge: 51403b6 5db7fe9
Author: Didier Raboud <odyx at debian.org>
Date:   Thu Mar 15 08:47:59 2018 +0100

    record new upstream branch and merge it

 CMakeLists.txt   |  2 +-
 debian/.git-dpm  | 14 ++++++------
 src/button.cxx   |  4 +---
 src/decmap.cxx   | 20 +++++++++++++----
 src/decmove.cxx  | 67 +++++++++++++++++++++++++++++++++-----------------------
 src/decor.h      |  1 +
 src/decstat.cxx  |  4 +++-
 src/event.cxx    | 40 ++++++++++++++++++---------------
 src/event.h      |  5 +++--
 src/fifo.cxx     |  6 +++--
 src/menu.cxx     |  4 +---
 src/pixmap.cxx   | 14 ++++++------
 src/progress.cxx |  4 +---
 13 files changed, 106 insertions(+), 79 deletions(-)

diff --cc debian/.git-dpm
index 4fdd93a,0000000..20be32e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 61a1ab65ebe5fa609899deffa05903d74e8ec6c0
- 61a1ab65ebe5fa609899deffa05903d74e8ec6c0
- 61a1ab65ebe5fa609899deffa05903d74e8ec6c0
- 61a1ab65ebe5fa609899deffa05903d74e8ec6c0
- planetblupi_1.12.2.orig.tar.gz
- 4a95a5b39fc0d62ce4c560984762053ff0937d36
- 106578253
++5db7fe91f6334926622b881c3b90e8bd0e1b0fe4
++5db7fe91f6334926622b881c3b90e8bd0e1b0fe4
++5db7fe91f6334926622b881c3b90e8bd0e1b0fe4
++5db7fe91f6334926622b881c3b90e8bd0e1b0fe4
++planetblupi_1.12.4.orig.tar.gz
++1efff98cbe040a7ee2ae9b7949fcb8c89b611078
++106578442

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