This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository planetblupi.
commit 2f4da9fda5cc1abeea65674bc093c74103a67296 Merge: 64b4d93 222113a Author: Didier Raboud <o...@debian.org> Date: Fri Dec 8 09:50:10 2017 +0100 merge patched-debian/master into debian/master CMakeLists.txt | 15 +- debian/.git-dpm | 6 +- ...-to-link-to-the-icon-from-the-desktop-fil.patch | 20 - debian/patches/series | 1 - resources/nsis/NSIS.template.in | 1016 ++++++++++++++++++++ resources/nsis/bootstrap.sh | 6 + src/blupi.cxx | 6 + src/blupi.h | 8 +- src/event.cxx | 25 +- src/event.h | 6 +- src/misc.cxx | 2 +- src/misc.h | 2 +- src/pixmap.cxx | 6 +- src/sound.cxx | 11 + 14 files changed, 1079 insertions(+), 51 deletions(-) diff --cc debian/.git-dpm index bdd7287,0000000..2637300 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 - 7831bc6a1846d599a7d92c27760ed11218d91977 - 7831bc6a1846d599a7d92c27760ed11218d91977 - 8f51f0c9cf33dff0d410dc8eadb0763d8c79a496 ++222113a3435624018122c62cf9bf76cac6885b96 ++222113a3435624018122c62cf9bf76cac6885b96 ++222113a3435624018122c62cf9bf76cac6885b96 +222113a3435624018122c62cf9bf76cac6885b96 +planetblupi_1.12.0-16-g222113a.orig.tar.xz +f22390db2544e6555423c441d85b914fbe8679ce +23152920 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/planetblupi.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits