Regenerated copyrights: canonicalized names, no emails

23 files changed, 49 insertions, 49 deletions

diff --git a/src/context/cdchunk_list.h b/src/context/cdchunk_list.h
index a6bc29f39..2f9652397 100644
--- a/src/context/cdchunk_list.h
+++ b/src/context/cdchunk_list.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file cdchunk_list.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Tim King
+ ** 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
diff --git a/src/context/cddense_set.h b/src/context/cddense_set.h
index 379f62aa7..c19a2400a 100644
--- a/src/context/cddense_set.h
+++ b/src/context/cddense_set.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file cddense_set.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/context/cdhashmap.h b/src/context/cdhashmap.h
index 0ea79b4be..3a7f56e17 100644
--- a/src/context/cdhashmap.h
+++ b/src/context/cdhashmap.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file cdhashmap.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Tim King
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/context/cdhashmap_forward.h b/src/context/cdhashmap_forward.h
index 14c1a7fef..346dba47c 100644
--- a/src/context/cdhashmap_forward.h
+++ b/src/context/cdhashmap_forward.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file cdhashmap_forward.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Tim King <taking@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Tim King, 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
diff --git a/src/context/cdhashset.h b/src/context/cdhashset.h
index 682a80fc9..c0fc95637 100644
--- a/src/context/cdhashset.h
+++ b/src/context/cdhashset.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file cdhashset.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Tim King <taking@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Tim King, Morgan Deters
+ ** Minor contributors (to current version): Francois Bobot
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/context/cdhashset_forward.h b/src/context/cdhashset_forward.h
index 82dc441bd..011e41111 100644
--- a/src/context/cdhashset_forward.h
+++ b/src/context/cdhashset_forward.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file cdhashset_forward.h
  ** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** 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
diff --git a/src/context/cdinsert_hashmap.h b/src/context/cdinsert_hashmap.h
index 22d5c26da..fa86235d4 100644
--- a/src/context/cdinsert_hashmap.h
+++ b/src/context/cdinsert_hashmap.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file cdinsert_hashmap.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/context/cdinsert_hashmap_forward.h b/src/context/cdinsert_hashmap_forward.h
index c497ad9b1..817899400 100644
--- a/src/context/cdinsert_hashmap_forward.h
+++ b/src/context/cdinsert_hashmap_forward.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file cdinsert_hashmap_forward.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
diff --git a/src/context/cdlist.h b/src/context/cdlist.h
index 2ee36db24..bf3bf5245 100644
--- a/src/context/cdlist.h
+++ b/src/context/cdlist.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file cdlist.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Tim King <taking@cs.nyu.edu>
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Tim King
+ ** Minor contributors (to current version): Francois Bobot
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/context/cdlist_forward.h b/src/context/cdlist_forward.h
index 4f2c53d53..dea2096fd 100644
--- a/src/context/cdlist_forward.h
+++ b/src/context/cdlist_forward.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file cdlist_forward.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Tim King <taking@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Tim King
  ** 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
diff --git a/src/context/cdmaybe.h b/src/context/cdmaybe.h
index c5eb9858f..db913d82a 100644
--- a/src/context/cdmaybe.h
+++ b/src/context/cdmaybe.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file cdmaybe.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Tim King
+ ** 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
diff --git a/src/context/cdo.h b/src/context/cdo.h
index 229d62328..de83c4aa5 100644
--- a/src/context/cdo.h
+++ b/src/context/cdo.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file cdo.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, François Bobot <francois@bobot.eu>
+ ** Minor contributors (to current version): Clark Barrett, Francois Bobot
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/context/cdqueue.h b/src/context/cdqueue.h
index a7c46779b..2f8f5b628 100644
--- a/src/context/cdqueue.h
+++ b/src/context/cdqueue.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file cdqueue.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Francois Bobot, Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/context/cdtrail_hashmap.h b/src/context/cdtrail_hashmap.h
index f4ed63e54..b34650f44 100644
--- a/src/context/cdtrail_hashmap.h
+++ b/src/context/cdtrail_hashmap.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file cdtrail_hashmap.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/context/cdtrail_hashmap_forward.h b/src/context/cdtrail_hashmap_forward.h
index f85d88014..2bbe32e80 100644
--- a/src/context/cdtrail_hashmap_forward.h
+++ b/src/context/cdtrail_hashmap_forward.h
@@ -1,7 +1,7 @@
 /*********************                                                        */
 /*! \file cdtrail_hashmap_forward.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
  ** Minor contributors (to current version): none
  ** This file is part of the CVC4 project.
diff --git a/src/context/cdtrail_queue.h b/src/context/cdtrail_queue.h
index f52798418..10645a5b7 100644
--- a/src/context/cdtrail_queue.h
+++ b/src/context/cdtrail_queue.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file cdtrail_queue.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
  ** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Morgan Deters
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/context/cdvector.h b/src/context/cdvector.h
index d4da4275d..6792cca9d 100644
--- a/src/context/cdvector.h
+++ b/src/context/cdvector.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file cdvector.h
  ** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Tim King
+ ** 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
diff --git a/src/context/context.cpp b/src/context/context.cpp
index 0c37a446f..f5efadf6f 100644
--- a/src/context/context.cpp
+++ b/src/context/context.cpp
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file context.cpp
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Clark Barrett
+ ** Minor contributors (to current version): Dejan Jovanovic
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/context/context.h b/src/context/context.h
index e11eac246..2b907ca2a 100644
--- a/src/context/context.h
+++ b/src/context/context.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file context.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Clark Barrett
+ ** Minor contributors (to current version): Tim King, Dejan Jovanovic
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/context/context_mm.cpp b/src/context/context_mm.cpp
index ed690d0a9..5945effe9 100644
--- a/src/context/context_mm.cpp
+++ b/src/context/context_mm.cpp
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file context_mm.cpp
  ** \verbatim
- ** Original author: Clark Barrett <barrett@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Clark Barrett
+ ** 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
diff --git a/src/context/context_mm.h b/src/context/context_mm.h
index 0c541daa2..b580d86d5 100644
--- a/src/context/context_mm.h
+++ b/src/context/context_mm.h
@@ -1,8 +1,8 @@
 /*********************                                                        */
 /*! \file context_mm.h
  ** \verbatim
- ** Original author: Clark Barrett <barrett@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Clark Barrett
+ ** 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
diff --git a/src/context/stacking_map.h b/src/context/stacking_map.h
index a2e4790c5..af78aa9d0 100644
--- a/src/context/stacking_map.h
+++ b/src/context/stacking_map.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file stacking_map.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Minor contributors (to current version): Dejan Jovanovic
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing
diff --git a/src/context/stacking_vector.h b/src/context/stacking_vector.h
index 4128e6156..4aa45e9cc 100644
--- a/src/context/stacking_vector.h
+++ b/src/context/stacking_vector.h
@@ -1,9 +1,9 @@
 /*********************                                                        */
 /*! \file stacking_vector.h
  ** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
  ** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Minor contributors (to current version): Dejan Jovanovic
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2013  New York University and The University of Iowa
  ** See the file COPYING in the top-level source directory for licensing