[wesnoth] 01/02: Merge branch 'devel' into trusty-ppa

[Vincent Cheng]

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

vcheng pushed a commit to branch trusty-ppa
in repository wesnoth.

commit ac4f0a5a36bfa7035dc3b1ba478ae7ae05757f31
Merge: 51a7c21 0bda29e
Author: Vincent Cheng <vcheng at debian.org>
Date:   Sun Aug 28 22:10:15 2016 -0700

    Merge branch 'devel' into trusty-ppa

 debian/changelog | 7 +++++++
 debian/rules     | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 1422d50,1fe10a4..469007f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ wesnoth-1.13 (1:1.13.5-2) UNRELEASED; urgency=medium
+ 
+   * Build with -std=c++11 to fix FTBFS on older distros (e.g. Debian 8,
+     Ubuntu 16.04) where this flag is not enabled by gcc by default.
+ 
+  -- Vincent Cheng <vcheng at debian.org>  Sun, 28 Aug 2016 22:00:31 -0700
+ 
 +wesnoth-1.13 (1:1.13.5-1~ppa1~trusty1) trusty; urgency=medium
 +
 +  * Backport devel release from Debian experimental.
 +
 + -- Vincent Cheng <vcheng at debian.org>  Sun, 28 Aug 2016 20:15:54 -0700
 +
  wesnoth-1.13 (1:1.13.5-1) experimental; urgency=medium
  
    * New upstream devel release.

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