merged develop to 3.3.1

This commit is contained in:
Olof hagsand 2017-06-07 20:54:11 +02:00
commit 6ebfc182f3
40 changed files with 1205 additions and 1334 deletions

4
configure vendored
View file

@ -2172,8 +2172,8 @@ _ACEOF
# Bind to specific CLIgen version
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: CLIXON version is ${CLIXON_VERSION}_PRE" >&5
$as_echo "CLIXON version is ${CLIXON_VERSION}_PRE" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: CLIXON version is ${CLIXON_VERSION}" >&5
$as_echo "CLIXON version is ${CLIXON_VERSION}" >&6; }
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do