summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMorgan Deters <mdeters@cs.nyu.edu>2014-01-02 14:13:17 -0500
committerMorgan Deters <mdeters@cs.nyu.edu>2014-01-02 14:13:17 -0500
commit9846e1db91243c3b507300dad318e81e28f9d4f4 (patch)
tree2b303413a79d0b809ae62b85e96480f120894c36 /src
parent56e7d8664950b77c368631f1d2122ce508dc5d7c (diff)
parent1e1ba9ff90b760ff7a029b479c659baca16b5a1e (diff)
Merge branch '1.3.x'
Diffstat (limited to 'src')
-rwxr-xr-xsrc/expr/mkexpr2
-rwxr-xr-xsrc/expr/mkkind2
-rwxr-xr-xsrc/expr/mkmetakind2
-rwxr-xr-xsrc/options/mkoptions2
-rw-r--r--src/parser/cvc/Cvc.g2
-rw-r--r--src/parser/smt1/Smt1.g2
-rw-r--r--src/parser/smt2/Smt2.g2
-rw-r--r--src/parser/tptp/Tptp.g2
-rwxr-xr-xsrc/theory/mkrewriter2
-rwxr-xr-xsrc/theory/mktheorytraits2
-rw-r--r--src/util/configuration_private.h2
11 files changed, 11 insertions, 11 deletions
diff --git a/src/expr/mkexpr b/src/expr/mkexpr
index 9e7a2596f..068063c05 100755
--- a/src/expr/mkexpr
+++ b/src/expr/mkexpr
@@ -15,7 +15,7 @@
# Output is to standard out.
#
-copyright=2010-2013
+copyright=2010-2014
filename=`basename "$1" | sed 's,_template,,'`
diff --git a/src/expr/mkkind b/src/expr/mkkind
index 02e0f50bf..987feafac 100755
--- a/src/expr/mkkind
+++ b/src/expr/mkkind
@@ -14,7 +14,7 @@
# Output is to standard out.
#
-copyright=2010-2013
+copyright=2010-2014
filename=`basename "$1" | sed 's,_template,,'`
diff --git a/src/expr/mkmetakind b/src/expr/mkmetakind
index 7ffe0230b..4dc2908a7 100755
--- a/src/expr/mkmetakind
+++ b/src/expr/mkmetakind
@@ -17,7 +17,7 @@
# Output is to standard out.
#
-copyright=2010-2013
+copyright=2010-2014
cat <<EOF
/********************* */
diff --git a/src/options/mkoptions b/src/options/mkoptions
index 8a3cec494..087af0ef6 100755
--- a/src/options/mkoptions
+++ b/src/options/mkoptions
@@ -12,7 +12,7 @@
# mkoptions (template-file output-file)+ -t options.h-template options.cpp-template (options-file output-dir)+
#
-copyright=2011-2013
+copyright=2011-2014
me=$(basename "$0")
diff --git a/src/parser/cvc/Cvc.g b/src/parser/cvc/Cvc.g
index 3ab6079a2..75607b9d8 100644
--- a/src/parser/cvc/Cvc.g
+++ b/src/parser/cvc/Cvc.g
@@ -417,7 +417,7 @@ Expr addNots(ExprManager* em, size_t n, Expr e) {
@header {
/**
** This file is part of CVC4.
- ** Copyright (c) 2009-2013 New York University and The University of Iowa
+ ** Copyright (c) 2009-2014 New York University and The University of Iowa
** See the file COPYING in the top-level source directory for licensing
** information.
**/
diff --git a/src/parser/smt1/Smt1.g b/src/parser/smt1/Smt1.g
index bfcd8cd4d..156aa1591 100644
--- a/src/parser/smt1/Smt1.g
+++ b/src/parser/smt1/Smt1.g
@@ -32,7 +32,7 @@ options {
@header {
/**
** This file is part of CVC4.
- ** Copyright (c) 2009-2013 New York University and The University of Iowa
+ ** Copyright (c) 2009-2014 New York University and The University of Iowa
** See the file COPYING in the top-level source directory for licensing
** information.
**/
diff --git a/src/parser/smt2/Smt2.g b/src/parser/smt2/Smt2.g
index be20e9416..39329e424 100644
--- a/src/parser/smt2/Smt2.g
+++ b/src/parser/smt2/Smt2.g
@@ -32,7 +32,7 @@ options {
@header {
/**
** This file is part of CVC4.
- ** Copyright (c) 2009-2013 New York University and The University of Iowa
+ ** Copyright (c) 2009-2014 New York University and The University of Iowa
** See the file COPYING in the top-level source directory for licensing
** information.
**/
diff --git a/src/parser/tptp/Tptp.g b/src/parser/tptp/Tptp.g
index d1e6f3a89..8528fc0ab 100644
--- a/src/parser/tptp/Tptp.g
+++ b/src/parser/tptp/Tptp.g
@@ -33,7 +33,7 @@ options {
@header {
/**
** This file is part of CVC4.
- ** Copyright (c) 2009-2013 New York University and The University of Iowa
+ ** Copyright (c) 2009-2014 New York University and The University of Iowa
** See the file COPYING in the top-level source directory for licensing
** information.
**/
diff --git a/src/theory/mkrewriter b/src/theory/mkrewriter
index 0a21a1fe4..5db2e970d 100755
--- a/src/theory/mkrewriter
+++ b/src/theory/mkrewriter
@@ -14,7 +14,7 @@
# Output is to standard out.
#
-copyright=2010-2013
+copyright=2010-2014
cat <<EOF
/********************* */
diff --git a/src/theory/mktheorytraits b/src/theory/mktheorytraits
index 97ede32d5..d6725997d 100755
--- a/src/theory/mktheorytraits
+++ b/src/theory/mktheorytraits
@@ -14,7 +14,7 @@
# Output is to standard out.
#
-copyright=2010-2013
+copyright=2010-2014
filename=`basename "$1" | sed 's,_template,,'`
diff --git a/src/util/configuration_private.h b/src/util/configuration_private.h
index 5d078b5ef..07ab4b17e 100644
--- a/src/util/configuration_private.h
+++ b/src/util/configuration_private.h
@@ -136,7 +136,7 @@ This is CVC4 version " CVC4_RELEASE_STRING ) + \
)) + "\n\
compiled with " + ::CVC4::Configuration::getCompiler() + "\n\
on " + ::CVC4::Configuration::getCompiledDateTime() + "\n\n\
-Copyright (C) 2009, 2010, 2011, 2012, 2013\n\
+Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014\n\
New York University and The University of Iowa\n\n" + \
( IS_GPL_BUILD ? "\
This build of CVC4 uses GPLed libraries, and is thus covered by the GNU\n\
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback