# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1470841210 -7200
# Node ID d5f8a56eda4c844197f2a9cc3b80d92231613874
# Parent  b327322ce2dd65cde6cd320eecdd742289cc1c20# Parent  69d8e1477c4308735e5ff3aff7d30e438b7f0daf
Merge 0.10->trunk

diff -r b327322ce2dd -r d5f8a56eda4c configure
--- a/configure	Wed Aug 10 16:57:16 2016 +0200
+++ b/configure	Wed Aug 10 17:00:10 2016 +0200
@@ -15,7 +15,6 @@
 ICU_FLAGS="-licui18n -licudata -licuuc"
 OPENSSL_LIB=crypto
 CC=gcc
-CXX=g++
 LD=gcc
 RUNWITH=lua
 EXCERTS=yes
@@ -385,7 +384,6 @@
 CFLAGS=$CFLAGS
 LDFLAGS=$LDFLAGS
 CC=$CC
-CXX=$CXX
 LD=$LD
 RUNWITH=$RUNWITH
 EXCERTS=$EXCERTS