diff options
| author | Kshitij Bansal <kshitij@cs.nyu.edu> | 2014-07-10 16:20:42 -0400 |
|---|---|---|
| committer | Kshitij Bansal <kshitij@cs.nyu.edu> | 2014-07-10 16:20:42 -0400 |
| commit | c30a3426c7c2cbaff88b5183b8d8c368a393ac4d (patch) | |
| tree | bd621f3766d2ae330a6c11499fe0a49958afa95d /src/proof/sat_proof.cpp | |
| parent | d4f76fdfaed04bf63bb609a5fd26b0d45a9e94f4 (diff) | |
| parent | e926fd162c6cee95d31044305e3b4df90b59f9fc (diff) | |
Merge remote-tracking branch 'origin/master' into segfaultfix
Diffstat (limited to 'src/proof/sat_proof.cpp')
| -rw-r--r-- | src/proof/sat_proof.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/proof/sat_proof.cpp b/src/proof/sat_proof.cpp index 3b5509ffb..0ace84b4d 100644 --- a/src/proof/sat_proof.cpp +++ b/src/proof/sat_proof.cpp @@ -2,10 +2,10 @@ /*! \file sat_proof.cpp ** \verbatim ** Original author: Liana Hadarean - ** Major contributors: none - ** Minor contributors (to current version): Morgan Deters + ** Major contributors: Morgan Deters + ** Minor contributors (to current version): none ** This file is part of the CVC4 project. - ** 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.\endverbatim ** |