summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMorgan Deters <mdeters@cs.nyu.edu>2013-04-02 14:31:53 -0400
committerMorgan Deters <mdeters@cs.nyu.edu>2013-04-02 14:36:18 -0400
commit166bbd9c5716e646769cdc38aaeff3bd75de94f8 (patch)
tree5ca77fed3bef0060fb28bc4d0661b6f3e31b9d62 /src
parent415c4f45eab364ea3c0cf15b2612406751527113 (diff)
Regenerated copyrights: canonicalized names, no emails
Diffstat (limited to 'src')
-rw-r--r--src/bindings/java_iterator_adapter.h2
-rw-r--r--src/bindings/java_stream_adapters.h2
-rw-r--r--src/bindings/swig.h2
-rw-r--r--src/compat/cvc3_compat.cpp4
-rw-r--r--src/compat/cvc3_compat.h4
-rw-r--r--src/context/cdchunk_list.h4
-rw-r--r--src/context/cddense_set.h4
-rw-r--r--src/context/cdhashmap.h6
-rw-r--r--src/context/cdhashmap_forward.h4
-rw-r--r--src/context/cdhashset.h6
-rw-r--r--src/context/cdhashset_forward.h4
-rw-r--r--src/context/cdinsert_hashmap.h4
-rw-r--r--src/context/cdinsert_hashmap_forward.h2
-rw-r--r--src/context/cdlist.h6
-rw-r--r--src/context/cdlist_forward.h4
-rw-r--r--src/context/cdmaybe.h4
-rw-r--r--src/context/cdo.h4
-rw-r--r--src/context/cdqueue.h4
-rw-r--r--src/context/cdtrail_hashmap.h4
-rw-r--r--src/context/cdtrail_hashmap_forward.h2
-rw-r--r--src/context/cdtrail_queue.h4
-rw-r--r--src/context/cdvector.h4
-rw-r--r--src/context/context.cpp6
-rw-r--r--src/context/context.h6
-rw-r--r--src/context/context_mm.cpp4
-rw-r--r--src/context/context_mm.h4
-rw-r--r--src/context/stacking_map.h4
-rw-r--r--src/context/stacking_vector.h4
-rw-r--r--src/decision/decision_engine.cpp4
-rw-r--r--src/decision/decision_engine.h4
-rw-r--r--src/decision/decision_mode.cpp2
-rw-r--r--src/decision/decision_mode.h2
-rw-r--r--src/decision/decision_strategy.h4
-rw-r--r--src/decision/justification_heuristic.cpp4
-rw-r--r--src/decision/justification_heuristic.h4
-rw-r--r--src/decision/options_handlers.h4
-rw-r--r--src/decision/relevancy.cpp4
-rw-r--r--src/decision/relevancy.h4
-rw-r--r--src/expr/attribute.cpp4
-rw-r--r--src/expr/attribute.h6
-rw-r--r--src/expr/attribute_internals.h4
-rw-r--r--src/expr/command.cpp6
-rw-r--r--src/expr/command.h4
-rw-r--r--src/expr/convenience_node_builders.h2
-rw-r--r--src/expr/expr_manager_scope.h4
-rw-r--r--src/expr/expr_manager_template.cpp6
-rw-r--r--src/expr/expr_manager_template.h6
-rw-r--r--src/expr/expr_stream.h2
-rw-r--r--src/expr/expr_template.cpp6
-rw-r--r--src/expr/expr_template.h6
-rw-r--r--src/expr/kind_map.h4
-rw-r--r--src/expr/kind_template.h4
-rw-r--r--src/expr/metakind_template.h4
-rw-r--r--src/expr/node.cpp4
-rw-r--r--src/expr/node.h6
-rw-r--r--src/expr/node_builder.h6
-rw-r--r--src/expr/node_manager.cpp6
-rw-r--r--src/expr/node_manager.h6
-rw-r--r--src/expr/node_self_iterator.h2
-rw-r--r--src/expr/node_value.cpp4
-rw-r--r--src/expr/node_value.h4
-rw-r--r--src/expr/options_handlers.h2
-rw-r--r--src/expr/pickle_data.cpp2
-rw-r--r--src/expr/pickle_data.h2
-rw-r--r--src/expr/pickler.cpp4
-rw-r--r--src/expr/pickler.h4
-rw-r--r--src/expr/symbol_table.cpp6
-rw-r--r--src/expr/symbol_table.h6
-rw-r--r--src/expr/type.cpp6
-rw-r--r--src/expr/type.h6
-rw-r--r--src/expr/type_checker.h2
-rw-r--r--src/expr/type_checker_template.cpp4
-rw-r--r--src/expr/type_node.cpp6
-rw-r--r--src/expr/type_node.h6
-rw-r--r--src/expr/type_properties_template.h2
-rw-r--r--src/expr/variable_type_map.h2
-rw-r--r--src/include/cvc4.h2
-rw-r--r--src/include/cvc4_private.h2
-rw-r--r--src/include/cvc4_private_library.h2
-rw-r--r--src/include/cvc4_public.h2
-rw-r--r--src/include/cvc4parser_private.h2
-rw-r--r--src/include/cvc4parser_public.h2
-rw-r--r--src/lib/clock_gettime.c2
-rw-r--r--src/lib/clock_gettime.h2
-rw-r--r--src/lib/ffs.c2
-rw-r--r--src/lib/ffs.h2
-rw-r--r--src/lib/replacements.h2
-rw-r--r--src/lib/strtok_r.c2
-rw-r--r--src/lib/strtok_r.h2
-rw-r--r--src/main/command_executor.cpp4
-rw-r--r--src/main/command_executor.h4
-rw-r--r--src/main/command_executor_portfolio.cpp4
-rw-r--r--src/main/command_executor_portfolio.h4
-rw-r--r--src/main/driver_unified.cpp6
-rw-r--r--src/main/interactive_shell.cpp6
-rw-r--r--src/main/interactive_shell.h4
-rw-r--r--src/main/main.cpp6
-rw-r--r--src/main/main.h2
-rw-r--r--src/main/options_handlers.h2
-rw-r--r--src/main/portfolio.cpp4
-rw-r--r--src/main/portfolio.h4
-rw-r--r--src/main/portfolio_util.cpp4
-rw-r--r--src/main/portfolio_util.h4
-rw-r--r--src/main/util.cpp4
-rw-r--r--src/options/base_options_handlers.h2
-rw-r--r--src/options/base_options_template.cpp2
-rw-r--r--src/options/base_options_template.h2
-rw-r--r--src/options/option_exception.h2
-rw-r--r--src/options/options.h2
-rw-r--r--src/options/options_holder_template.h2
-rw-r--r--src/options/options_template.cpp2
-rw-r--r--src/parser/antlr_input.cpp6
-rw-r--r--src/parser/antlr_input.h6
-rw-r--r--src/parser/antlr_line_buffered_input.cpp2
-rw-r--r--src/parser/antlr_line_buffered_input.h2
-rw-r--r--src/parser/antlr_tracing.h2
-rw-r--r--src/parser/bounded_token_buffer.cpp4
-rw-r--r--src/parser/bounded_token_buffer.h4
-rw-r--r--src/parser/bounded_token_factory.cpp4
-rw-r--r--src/parser/bounded_token_factory.h4
-rw-r--r--src/parser/cvc/Cvc.g6
-rw-r--r--src/parser/cvc/cvc_input.cpp4
-rw-r--r--src/parser/cvc/cvc_input.h6
-rw-r--r--src/parser/input.cpp6
-rw-r--r--src/parser/input.h6
-rw-r--r--src/parser/memory_mapped_input_buffer.cpp6
-rw-r--r--src/parser/memory_mapped_input_buffer.h4
-rw-r--r--src/parser/parser.cpp6
-rw-r--r--src/parser/parser.h6
-rw-r--r--src/parser/parser_builder.cpp6
-rw-r--r--src/parser/parser_builder.h4
-rw-r--r--src/parser/parser_exception.h4
-rw-r--r--src/parser/smt1/Smt1.g6
-rw-r--r--src/parser/smt1/smt1.cpp6
-rw-r--r--src/parser/smt1/smt1.h6
-rw-r--r--src/parser/smt1/smt1_input.cpp4
-rw-r--r--src/parser/smt1/smt1_input.h4
-rw-r--r--src/parser/smt2/Smt2.g6
-rw-r--r--src/parser/smt2/smt2.cpp6
-rw-r--r--src/parser/smt2/smt2.h4
-rw-r--r--src/parser/smt2/smt2_input.cpp4
-rw-r--r--src/parser/smt2/smt2_input.h4
-rw-r--r--src/parser/tptp/Tptp.g4
-rw-r--r--src/parser/tptp/tptp.cpp4
-rw-r--r--src/parser/tptp/tptp.h4
-rw-r--r--src/parser/tptp/tptp_input.cpp4
-rw-r--r--src/parser/tptp/tptp_input.h4
-rw-r--r--src/printer/ast/ast_printer.cpp4
-rw-r--r--src/printer/ast/ast_printer.h2
-rw-r--r--src/printer/cvc/cvc_printer.cpp6
-rw-r--r--src/printer/cvc/cvc_printer.h4
-rw-r--r--src/printer/dagification_visitor.cpp4
-rw-r--r--src/printer/dagification_visitor.h2
-rw-r--r--src/printer/model_format_mode.cpp4
-rw-r--r--src/printer/model_format_mode.h4
-rw-r--r--src/printer/options_handlers.h2
-rw-r--r--src/printer/printer.cpp4
-rw-r--r--src/printer/printer.h4
-rw-r--r--src/printer/smt1/smt1_printer.cpp4
-rw-r--r--src/printer/smt1/smt1_printer.h2
-rw-r--r--src/printer/smt2/smt2_printer.cpp4
-rw-r--r--src/printer/smt2/smt2_printer.h2
-rw-r--r--src/proof/cnf_proof.cpp4
-rw-r--r--src/proof/cnf_proof.h4
-rw-r--r--src/proof/proof.h4
-rw-r--r--src/proof/proof_manager.cpp4
-rw-r--r--src/proof/proof_manager.h4
-rw-r--r--src/proof/sat_proof.cpp4
-rw-r--r--src/proof/sat_proof.h4
-rw-r--r--src/prop/cnf_stream.cpp6
-rw-r--r--src/prop/cnf_stream.h6
-rw-r--r--src/prop/options_handlers.h2
-rw-r--r--src/prop/prop_engine.cpp6
-rw-r--r--src/prop/prop_engine.h6
-rw-r--r--src/prop/registrar.h4
-rw-r--r--src/prop/sat_solver.h4
-rw-r--r--src/prop/sat_solver_factory.cpp6
-rw-r--r--src/prop/sat_solver_factory.h4
-rw-r--r--src/prop/sat_solver_registry.cpp4
-rw-r--r--src/prop/sat_solver_registry.h4
-rw-r--r--src/prop/sat_solver_types.h4
-rw-r--r--src/prop/theory_proxy.cpp6
-rw-r--r--src/prop/theory_proxy.h6
-rw-r--r--src/smt/boolean_terms.cpp2
-rw-r--r--src/smt/boolean_terms.h2
-rw-r--r--src/smt/command_list.cpp2
-rw-r--r--src/smt/command_list.h2
-rw-r--r--src/smt/logic_exception.h2
-rw-r--r--src/smt/modal_exception.h2
-rw-r--r--src/smt/model_postprocessor.cpp2
-rw-r--r--src/smt/model_postprocessor.h2
-rw-r--r--src/smt/options_handlers.h2
-rw-r--r--src/smt/simplification_mode.cpp2
-rw-r--r--src/smt/simplification_mode.h2
-rw-r--r--src/smt/smt_engine.cpp6
-rw-r--r--src/smt/smt_engine.h4
-rw-r--r--src/smt/smt_engine_scope.cpp2
-rw-r--r--src/smt/smt_engine_scope.h2
-rw-r--r--src/smt/smt_options_template.cpp2
-rw-r--r--src/theory/arith/arith_heuristic_pivot_rule.cpp2
-rw-r--r--src/theory/arith/arith_heuristic_pivot_rule.h2
-rw-r--r--src/theory/arith/arith_priority_queue.cpp4
-rw-r--r--src/theory/arith/arith_priority_queue.h4
-rw-r--r--src/theory/arith/arith_propagation_mode.cpp2
-rw-r--r--src/theory/arith/arith_propagation_mode.h2
-rw-r--r--src/theory/arith/arith_rewriter.cpp4
-rw-r--r--src/theory/arith/arith_rewriter.h4
-rw-r--r--src/theory/arith/arith_static_learner.cpp4
-rw-r--r--src/theory/arith/arith_static_learner.h6
-rw-r--r--src/theory/arith/arith_unate_lemma_mode.cpp2
-rw-r--r--src/theory/arith/arith_unate_lemma_mode.h2
-rw-r--r--src/theory/arith/arith_utilities.h6
-rw-r--r--src/theory/arith/arithvar.cpp2
-rw-r--r--src/theory/arith/arithvar.h4
-rw-r--r--src/theory/arith/arithvar_node_map.h6
-rw-r--r--src/theory/arith/congruence_manager.cpp4
-rw-r--r--src/theory/arith/congruence_manager.h6
-rw-r--r--src/theory/arith/constraint.cpp4
-rw-r--r--src/theory/arith/constraint.h4
-rw-r--r--src/theory/arith/constraint_forward.h4
-rw-r--r--src/theory/arith/delta_rational.cpp4
-rw-r--r--src/theory/arith/delta_rational.h4
-rw-r--r--src/theory/arith/dio_solver.cpp6
-rw-r--r--src/theory/arith/dio_solver.h4
-rw-r--r--src/theory/arith/linear_equality.cpp4
-rw-r--r--src/theory/arith/linear_equality.h4
-rw-r--r--src/theory/arith/matrix.cpp4
-rw-r--r--src/theory/arith/matrix.h4
-rw-r--r--src/theory/arith/normal_form.cpp4
-rw-r--r--src/theory/arith/normal_form.h4
-rw-r--r--src/theory/arith/options_handlers.h2
-rw-r--r--src/theory/arith/partial_model.cpp4
-rw-r--r--src/theory/arith/partial_model.h4
-rw-r--r--src/theory/arith/simplex.cpp4
-rw-r--r--src/theory/arith/simplex.h4
-rw-r--r--src/theory/arith/theory_arith.cpp4
-rw-r--r--src/theory/arith/theory_arith.h6
-rw-r--r--src/theory/arith/theory_arith_type_rules.h4
-rw-r--r--src/theory/arith/type_enumerator.h2
-rw-r--r--src/theory/arrays/array_info.cpp6
-rw-r--r--src/theory/arrays/array_info.h4
-rw-r--r--src/theory/arrays/static_fact_manager.cpp4
-rw-r--r--src/theory/arrays/static_fact_manager.h4
-rw-r--r--src/theory/arrays/theory_arrays.cpp6
-rw-r--r--src/theory/arrays/theory_arrays.h6
-rw-r--r--src/theory/arrays/theory_arrays_model.cpp4
-rw-r--r--src/theory/arrays/theory_arrays_model.h4
-rw-r--r--src/theory/arrays/theory_arrays_rewriter.h6
-rw-r--r--src/theory/arrays/theory_arrays_type_rules.h6
-rw-r--r--src/theory/arrays/type_enumerator.h4
-rw-r--r--src/theory/arrays/union_find.cpp2
-rw-r--r--src/theory/arrays/union_find.h2
-rw-r--r--src/theory/booleans/boolean_term_conversion_mode.cpp2
-rw-r--r--src/theory/booleans/boolean_term_conversion_mode.h2
-rw-r--r--src/theory/booleans/circuit_propagator.cpp4
-rw-r--r--src/theory/booleans/circuit_propagator.h6
-rw-r--r--src/theory/booleans/options_handlers.h2
-rw-r--r--src/theory/booleans/theory_bool.cpp4
-rw-r--r--src/theory/booleans/theory_bool.h4
-rw-r--r--src/theory/booleans/theory_bool_rewriter.cpp6
-rw-r--r--src/theory/booleans/theory_bool_rewriter.h4
-rw-r--r--src/theory/booleans/theory_bool_type_rules.h6
-rw-r--r--src/theory/booleans/type_enumerator.h2
-rw-r--r--src/theory/builtin/theory_builtin.cpp4
-rw-r--r--src/theory/builtin/theory_builtin.h2
-rw-r--r--src/theory/builtin/theory_builtin_rewriter.cpp4
-rw-r--r--src/theory/builtin/theory_builtin_rewriter.h4
-rw-r--r--src/theory/builtin/theory_builtin_type_rules.h4
-rw-r--r--src/theory/builtin/type_enumerator.h2
-rw-r--r--src/theory/bv/bitblast_strategies.cpp4
-rw-r--r--src/theory/bv/bitblast_strategies.h4
-rw-r--r--src/theory/bv/bitblaster.cpp6
-rw-r--r--src/theory/bv/bitblaster.h4
-rw-r--r--src/theory/bv/bv_inequality_graph.cpp6
-rw-r--r--src/theory/bv/bv_inequality_graph.h4
-rw-r--r--src/theory/bv/bv_subtheory.h6
-rw-r--r--src/theory/bv/bv_subtheory_bitblast.cpp6
-rw-r--r--src/theory/bv/bv_subtheory_bitblast.h6
-rw-r--r--src/theory/bv/bv_subtheory_core.cpp4
-rw-r--r--src/theory/bv/bv_subtheory_core.h6
-rw-r--r--src/theory/bv/bv_subtheory_inequality.cpp4
-rw-r--r--src/theory/bv/bv_subtheory_inequality.h4
-rw-r--r--src/theory/bv/cd_set_collection.h4
-rw-r--r--src/theory/bv/slicer.cpp4
-rw-r--r--src/theory/bv/slicer.h4
-rw-r--r--src/theory/bv/theory_bv.cpp6
-rw-r--r--src/theory/bv/theory_bv.h6
-rw-r--r--src/theory/bv/theory_bv_rewrite_rules.h6
-rw-r--r--src/theory/bv/theory_bv_rewrite_rules_constant_evaluation.h6
-rw-r--r--src/theory/bv/theory_bv_rewrite_rules_core.h4
-rw-r--r--src/theory/bv/theory_bv_rewrite_rules_normalization.h6
-rw-r--r--src/theory/bv/theory_bv_rewrite_rules_operator_elimination.h6
-rw-r--r--src/theory/bv/theory_bv_rewrite_rules_simplification.h6
-rw-r--r--src/theory/bv/theory_bv_rewriter.cpp6
-rw-r--r--src/theory/bv/theory_bv_rewriter.h6
-rw-r--r--src/theory/bv/theory_bv_type_rules.h4
-rw-r--r--src/theory/bv/theory_bv_utils.h6
-rw-r--r--src/theory/bv/type_enumerator.h2
-rw-r--r--src/theory/datatypes/datatypes_rewriter.h4
-rw-r--r--src/theory/datatypes/theory_datatypes.cpp6
-rw-r--r--src/theory/datatypes/theory_datatypes.h6
-rw-r--r--src/theory/datatypes/theory_datatypes_type_rules.h6
-rw-r--r--src/theory/datatypes/type_enumerator.h4
-rw-r--r--src/theory/example/ecdata.cpp2
-rw-r--r--src/theory/example/ecdata.h2
-rw-r--r--src/theory/example/theory_uf_tim.cpp2
-rw-r--r--src/theory/example/theory_uf_tim.h2
-rw-r--r--src/theory/interrupted.h2
-rw-r--r--src/theory/ite_simplifier.cpp4
-rw-r--r--src/theory/ite_simplifier.h4
-rw-r--r--src/theory/logic_info.cpp4
-rw-r--r--src/theory/logic_info.h4
-rw-r--r--src/theory/model.cpp6
-rw-r--r--src/theory/model.h6
-rw-r--r--src/theory/options_handlers.h2
-rw-r--r--src/theory/output_channel.h4
-rw-r--r--src/theory/quantifiers/candidate_generator.cpp2
-rw-r--r--src/theory/quantifiers/candidate_generator.h2
-rw-r--r--src/theory/quantifiers/first_order_model.cpp4
-rw-r--r--src/theory/quantifiers/first_order_model.h4
-rw-r--r--src/theory/quantifiers/inst_gen.cpp4
-rw-r--r--src/theory/quantifiers/inst_gen.h4
-rw-r--r--src/theory/quantifiers/inst_match.cpp6
-rw-r--r--src/theory/quantifiers/inst_match.h4
-rw-r--r--src/theory/quantifiers/inst_match_generator.cpp4
-rw-r--r--src/theory/quantifiers/inst_match_generator.h4
-rw-r--r--src/theory/quantifiers/inst_strategy_cbqi.cpp4
-rw-r--r--src/theory/quantifiers/inst_strategy_cbqi.h4
-rw-r--r--src/theory/quantifiers/inst_strategy_e_matching.cpp4
-rw-r--r--src/theory/quantifiers/inst_strategy_e_matching.h4
-rw-r--r--src/theory/quantifiers/instantiation_engine.cpp4
-rw-r--r--src/theory/quantifiers/instantiation_engine.h4
-rw-r--r--src/theory/quantifiers/macros.cpp4
-rw-r--r--src/theory/quantifiers/macros.h4
-rw-r--r--src/theory/quantifiers/model_builder.cpp4
-rw-r--r--src/theory/quantifiers/model_builder.h4
-rw-r--r--src/theory/quantifiers/model_engine.cpp6
-rw-r--r--src/theory/quantifiers/model_engine.h4
-rw-r--r--src/theory/quantifiers/modes.cpp4
-rw-r--r--src/theory/quantifiers/modes.h4
-rw-r--r--src/theory/quantifiers/options_handlers.h4
-rw-r--r--src/theory/quantifiers/quant_util.cpp4
-rw-r--r--src/theory/quantifiers/quant_util.h4
-rw-r--r--src/theory/quantifiers/quantifiers_attributes.cpp4
-rw-r--r--src/theory/quantifiers/quantifiers_attributes.h4
-rw-r--r--src/theory/quantifiers/quantifiers_rewriter.cpp6
-rw-r--r--src/theory/quantifiers/quantifiers_rewriter.h4
-rw-r--r--src/theory/quantifiers/relevant_domain.cpp4
-rw-r--r--src/theory/quantifiers/relevant_domain.h4
-rw-r--r--src/theory/quantifiers/term_database.cpp6
-rw-r--r--src/theory/quantifiers/term_database.h4
-rw-r--r--src/theory/quantifiers/theory_quantifiers.cpp4
-rw-r--r--src/theory/quantifiers/theory_quantifiers.h4
-rw-r--r--src/theory/quantifiers/theory_quantifiers_type_rules.h2
-rw-r--r--src/theory/quantifiers/trigger.cpp6
-rw-r--r--src/theory/quantifiers/trigger.h6
-rw-r--r--src/theory/quantifiers_engine.cpp6
-rw-r--r--src/theory/quantifiers_engine.h6
-rw-r--r--src/theory/rep_set.cpp4
-rw-r--r--src/theory/rep_set.h4
-rw-r--r--src/theory/rewriter.cpp6
-rw-r--r--src/theory/rewriter.h4
-rw-r--r--src/theory/rewriter_attributes.h4
-rw-r--r--src/theory/rewriter_tables_template.h4
-rw-r--r--src/theory/rewriterules/efficient_e_matching.cpp4
-rw-r--r--src/theory/rewriterules/efficient_e_matching.h4
-rw-r--r--src/theory/rewriterules/rr_candidate_generator.cpp4
-rw-r--r--src/theory/rewriterules/rr_candidate_generator.h4
-rw-r--r--src/theory/rewriterules/rr_inst_match.cpp6
-rw-r--r--src/theory/rewriterules/rr_inst_match.h6
-rw-r--r--src/theory/rewriterules/rr_inst_match_impl.h6
-rw-r--r--src/theory/rewriterules/rr_trigger.cpp4
-rw-r--r--src/theory/rewriterules/rr_trigger.h6
-rw-r--r--src/theory/rewriterules/theory_rewriterules.cpp6
-rw-r--r--src/theory/rewriterules/theory_rewriterules.h4
-rw-r--r--src/theory/rewriterules/theory_rewriterules_params.h4
-rw-r--r--src/theory/rewriterules/theory_rewriterules_preprocess.h4
-rw-r--r--src/theory/rewriterules/theory_rewriterules_rewriter.h2
-rw-r--r--src/theory/rewriterules/theory_rewriterules_rules.cpp6
-rw-r--r--src/theory/rewriterules/theory_rewriterules_rules.h2
-rw-r--r--src/theory/rewriterules/theory_rewriterules_type_rules.h4
-rw-r--r--src/theory/shared_terms_database.cpp6
-rw-r--r--src/theory/shared_terms_database.h6
-rw-r--r--src/theory/substitutions.cpp4
-rw-r--r--src/theory/substitutions.h4
-rw-r--r--src/theory/term_registration_visitor.cpp6
-rw-r--r--src/theory/term_registration_visitor.h4
-rw-r--r--src/theory/theory.cpp6
-rw-r--r--src/theory/theory.h6
-rw-r--r--src/theory/theory_engine.cpp6
-rw-r--r--src/theory/theory_engine.h6
-rw-r--r--src/theory/theory_registrar.h4
-rw-r--r--src/theory/theory_test_utils.h6
-rw-r--r--src/theory/theory_traits_template.h4
-rw-r--r--src/theory/theoryof_mode.h4
-rw-r--r--src/theory/type_enumerator.h2
-rw-r--r--src/theory/type_enumerator_template.cpp2
-rw-r--r--src/theory/uf/equality_engine.cpp4
-rw-r--r--src/theory/uf/equality_engine.h6
-rw-r--r--src/theory/uf/equality_engine_types.h4
-rw-r--r--src/theory/uf/options_handlers.h2
-rw-r--r--src/theory/uf/symmetry_breaker.cpp2
-rw-r--r--src/theory/uf/symmetry_breaker.h2
-rw-r--r--src/theory/uf/theory_uf.cpp6
-rw-r--r--src/theory/uf/theory_uf.h6
-rw-r--r--src/theory/uf/theory_uf_model.cpp6
-rw-r--r--src/theory/uf/theory_uf_model.h4
-rw-r--r--src/theory/uf/theory_uf_rewriter.h4
-rw-r--r--src/theory/uf/theory_uf_strong_solver.cpp6
-rw-r--r--src/theory/uf/theory_uf_strong_solver.h4
-rw-r--r--src/theory/uf/theory_uf_type_rules.h6
-rw-r--r--src/theory/unconstrained_simplifier.cpp4
-rw-r--r--src/theory/unconstrained_simplifier.h4
-rw-r--r--src/theory/valuation.cpp6
-rw-r--r--src/theory/valuation.h6
-rw-r--r--src/util/abstract_value.cpp2
-rw-r--r--src/util/abstract_value.h2
-rw-r--r--src/util/array.h2
-rw-r--r--src/util/array_store_all.cpp2
-rw-r--r--src/util/array_store_all.h2
-rw-r--r--src/util/ascription_type.h2
-rw-r--r--src/util/backtrackable.h2
-rw-r--r--src/util/bitvector.h6
-rw-r--r--src/util/bool.h2
-rw-r--r--src/util/boolean_simplification.cpp2
-rw-r--r--src/util/boolean_simplification.h4
-rw-r--r--src/util/cache.h2
-rw-r--r--src/util/cardinality.cpp4
-rw-r--r--src/util/cardinality.h4
-rw-r--r--src/util/channel.h2
-rw-r--r--src/util/configuration.cpp4
-rw-r--r--src/util/configuration.h4
-rw-r--r--src/util/configuration_private.h6
-rw-r--r--src/util/cvc4_assert.cpp2
-rw-r--r--src/util/cvc4_assert.h4
-rw-r--r--src/util/datatype.cpp4
-rw-r--r--src/util/datatype.h4
-rw-r--r--src/util/debug.h2
-rw-r--r--src/util/dense_map.h4
-rw-r--r--src/util/dump.cpp2
-rw-r--r--src/util/dump.h2
-rw-r--r--src/util/dynamic_array.h4
-rw-r--r--src/util/exception.cpp2
-rw-r--r--src/util/exception.h2
-rw-r--r--src/util/gmp_util.h6
-rw-r--r--src/util/hash.h6
-rw-r--r--src/util/index.h6
-rw-r--r--src/util/integer.h.in4
-rw-r--r--src/util/integer_cln_imp.h6
-rw-r--r--src/util/integer_gmp_imp.h6
-rw-r--r--src/util/ite_removal.cpp6
-rw-r--r--src/util/ite_removal.h6
-rw-r--r--src/util/language.cpp4
-rw-r--r--src/util/language.h4
-rw-r--r--src/util/lemma_input_channel.h2
-rw-r--r--src/util/lemma_output_channel.h2
-rw-r--r--src/util/matcher.h4
-rw-r--r--src/util/node_visitor.h4
-rw-r--r--src/util/ntuple.h2
-rw-r--r--src/util/output.cpp2
-rw-r--r--src/util/output.h4
-rw-r--r--src/util/predicate.cpp2
-rw-r--r--src/util/predicate.h2
-rw-r--r--src/util/proof.h2
-rw-r--r--src/util/rational.h.in4
-rw-r--r--src/util/rational_cln_imp.cpp4
-rw-r--r--src/util/rational_cln_imp.h6
-rw-r--r--src/util/rational_gmp_imp.cpp4
-rw-r--r--src/util/rational_gmp_imp.h6
-rw-r--r--src/util/record.cpp2
-rw-r--r--src/util/record.h2
-rw-r--r--src/util/recursion_breaker.h2
-rw-r--r--src/util/result.cpp4
-rw-r--r--src/util/result.h4
-rw-r--r--src/util/sexpr.cpp2
-rw-r--r--src/util/sexpr.h6
-rw-r--r--src/util/sort_inference.cpp4
-rw-r--r--src/util/sort_inference.h4
-rw-r--r--src/util/statistics.cpp2
-rw-r--r--src/util/statistics.h2
-rw-r--r--src/util/statistics_registry.cpp4
-rw-r--r--src/util/statistics_registry.h4
-rw-r--r--src/util/subrange_bound.h4
-rw-r--r--src/util/tls.h.in4
-rw-r--r--src/util/trans_closure.cpp6
-rw-r--r--src/util/trans_closure.h6
-rw-r--r--src/util/tuple.h2
-rw-r--r--src/util/uninterpreted_constant.cpp2
-rw-r--r--src/util/uninterpreted_constant.h2
-rw-r--r--src/util/util_model.cpp4
-rw-r--r--src/util/util_model.h4
-rw-r--r--src/util/utility.h2
492 files changed, 983 insertions, 983 deletions
diff --git a/src/bindings/java_iterator_adapter.h b/src/bindings/java_iterator_adapter.h
index 53143a005..4e09f910a 100644
--- a/src/bindings/java_iterator_adapter.h
+++ b/src/bindings/java_iterator_adapter.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file java_iterator_adapter.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/bindings/java_stream_adapters.h b/src/bindings/java_stream_adapters.h
index 304327442..eefb31e6d 100644
--- a/src/bindings/java_stream_adapters.h
+++ b/src/bindings/java_stream_adapters.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file java_stream_adapters.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/bindings/swig.h b/src/bindings/swig.h
index 67ac1c2ab..94ad91dc6 100644
--- a/src/bindings/swig.h
+++ b/src/bindings/swig.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file swig.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/compat/cvc3_compat.cpp b/src/compat/cvc3_compat.cpp
index bd4512a10..0ecc6b5c7 100644
--- a/src/compat/cvc3_compat.cpp
+++ b/src/compat/cvc3_compat.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file cvc3_compat.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** 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/compat/cvc3_compat.h b/src/compat/cvc3_compat.h
index f2746960f..444849574 100644
--- a/src/compat/cvc3_compat.h
+++ b/src/compat/cvc3_compat.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file cvc3_compat.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>
+ ** 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/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
diff --git a/src/decision/decision_engine.cpp b/src/decision/decision_engine.cpp
index bba44bb70..687515ff0 100644
--- a/src/decision/decision_engine.cpp
+++ b/src/decision/decision_engine.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file decision_engine.cpp
** \verbatim
- ** Original author: Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Original author: Kshitij Bansal
** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Tim King, 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/decision/decision_engine.h b/src/decision/decision_engine.h
index da548784f..5d7c5ea74 100644
--- a/src/decision/decision_engine.h
+++ b/src/decision/decision_engine.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file decision_engine.h
** \verbatim
- ** Original author: Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Original author: Kshitij Bansal
** Major contributors: none
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Clark Barrett, Dejan Jovanovic, 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/decision/decision_mode.cpp b/src/decision/decision_mode.cpp
index 6b398570b..dfbd035f7 100644
--- a/src/decision/decision_mode.cpp
+++ b/src/decision/decision_mode.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file decision_mode.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/decision/decision_mode.h b/src/decision/decision_mode.h
index 6a02c1d2d..335e6279e 100644
--- a/src/decision/decision_mode.h
+++ b/src/decision/decision_mode.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file decision_mode.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/decision/decision_strategy.h b/src/decision/decision_strategy.h
index 22b6e515a..7f6f30a0a 100644
--- a/src/decision/decision_strategy.h
+++ b/src/decision/decision_strategy.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file decision_strategy.h
** \verbatim
- ** Original author: Kshitij Bansal <kshitij@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Kshitij Bansal
+ ** 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/decision/justification_heuristic.cpp b/src/decision/justification_heuristic.cpp
index ae4eefe11..28d26adb1 100644
--- a/src/decision/justification_heuristic.cpp
+++ b/src/decision/justification_heuristic.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file justification_heuristic.cpp
** \verbatim
- ** Original author: Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Original author: Kshitij Bansal
** 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/decision/justification_heuristic.h b/src/decision/justification_heuristic.h
index d4adaefd1..503f6c2af 100644
--- a/src/decision/justification_heuristic.h
+++ b/src/decision/justification_heuristic.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file justification_heuristic.h
** \verbatim
- ** Original author: Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Original author: Kshitij Bansal
** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Tim King, 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/decision/options_handlers.h b/src/decision/options_handlers.h
index b18180f69..1d4321614 100644
--- a/src/decision/options_handlers.h
+++ b/src/decision/options_handlers.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file options_handlers.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Minor contributors (to current version): Kshitij Bansal
** 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/decision/relevancy.cpp b/src/decision/relevancy.cpp
index fb79293b9..f83e238d4 100644
--- a/src/decision/relevancy.cpp
+++ b/src/decision/relevancy.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file relevancy.cpp
** \verbatim
- ** Original author: Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Original author: Kshitij Bansal
** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Dejan Jovanovic, 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/decision/relevancy.h b/src/decision/relevancy.h
index 115ef2e49..fd16eb0cc 100644
--- a/src/decision/relevancy.h
+++ b/src/decision/relevancy.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file relevancy.h
** \verbatim
- ** Original author: Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Original author: Kshitij Bansal
** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Dejan Jovanović <dejan@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Tim King, Dejan Jovanovic, 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/expr/attribute.cpp b/src/expr/attribute.cpp
index d1d50cad5..20d52e3cc 100644
--- a/src/expr/attribute.cpp
+++ b/src/expr/attribute.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file attribute.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
** 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/expr/attribute.h b/src/expr/attribute.h
index 440ebfbe0..b155b3a1c 100644
--- a/src/expr/attribute.h
+++ b/src/expr/attribute.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file attribute.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Christopher L. Conway <christopherleeconway@gmail.com>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Christopher L. Conway, 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/expr/attribute_internals.h b/src/expr/attribute_internals.h
index d3d8c7ca0..d7a61e32c 100644
--- a/src/expr/attribute_internals.h
+++ b/src/expr/attribute_internals.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file attribute_internals.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/expr/command.cpp b/src/expr/command.cpp
index b370894d2..3a88a6cba 100644
--- a/src/expr/command.cpp
+++ b/src/expr/command.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file command.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: François Bobot <francois@bobot.eu>
- ** Minor contributors (to current version): Kshitij Bansal <kshitij@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Francois Bobot
+ ** Minor contributors (to current version): Kshitij Bansal, Dejan Jovanovic, Andrew Reynolds
** 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/expr/command.h b/src/expr/command.h
index da67a8290..38a8b1efa 100644
--- a/src/expr/command.h
+++ b/src/expr/command.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file command.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Kshitij Bansal <kshitij@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>, François Bobot <francois@bobot.eu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Minor contributors (to current version): Kshitij Bansal, Christopher L. Conway, Dejan Jovanovic, Francois Bobot, Andrew Reynolds
** 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/expr/convenience_node_builders.h b/src/expr/convenience_node_builders.h
index ff1fd6e5c..93b8d460d 100644
--- a/src/expr/convenience_node_builders.h
+++ b/src/expr/convenience_node_builders.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file convenience_node_builders.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/expr/expr_manager_scope.h b/src/expr/expr_manager_scope.h
index 4dfbe2cf7..ea5452eac 100644
--- a/src/expr/expr_manager_scope.h
+++ b/src/expr/expr_manager_scope.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file expr_manager_scope.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/expr/expr_manager_template.cpp b/src/expr/expr_manager_template.cpp
index 242c772e7..524bc2095 100644
--- a/src/expr/expr_manager_template.cpp
+++ b/src/expr/expr_manager_template.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file expr_manager_template.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>, Christopher L. Conway <christopherleeconway@gmail.com>
- ** Minor contributors (to current version): Kshitij Bansal <kshitij@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic, Christopher L. Conway
+ ** Minor contributors (to current version): Kshitij Bansal, Andrew Reynolds
** 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/expr/expr_manager_template.h b/src/expr/expr_manager_template.h
index 7b5ea953f..fd81c9bf8 100644
--- a/src/expr/expr_manager_template.h
+++ b/src/expr/expr_manager_template.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file expr_manager_template.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Tim King <taking@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Andrew Reynolds, Tim King, Christopher L. Conway
** 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/expr/expr_stream.h b/src/expr/expr_stream.h
index 10c8ee2ee..edfa4ba07 100644
--- a/src/expr/expr_stream.h
+++ b/src/expr/expr_stream.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file expr_stream.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/expr/expr_template.cpp b/src/expr/expr_template.cpp
index 707baa935..7e809ed62 100644
--- a/src/expr/expr_template.cpp
+++ b/src/expr/expr_template.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file expr_template.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Kshitij Bansal <kshitij@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Tim King, Kshitij Bansal, Christopher L. Conway
** 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/expr/expr_template.h b/src/expr/expr_template.h
index eb8a588c6..7772de81e 100644
--- a/src/expr/expr_template.h
+++ b/src/expr/expr_template.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file expr_template.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Liana Hadarean <lianahady@gmail.com>, Kshitij Bansal <kshitij@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Liana Hadarean, Kshitij Bansal, Tim King, Christopher L. Conway
** 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/expr/kind_map.h b/src/expr/kind_map.h
index a7cae2259..e66f8c3b3 100644
--- a/src/expr/kind_map.h
+++ b/src/expr/kind_map.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file kind_map.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Dejan Jovanovic
** 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/expr/kind_template.h b/src/expr/kind_template.h
index 1b50567b4..b98a9a373 100644
--- a/src/expr/kind_template.h
+++ b/src/expr/kind_template.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file kind_template.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
** 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/expr/metakind_template.h b/src/expr/metakind_template.h
index ddb6515aa..10b67b4d6 100644
--- a/src/expr/metakind_template.h
+++ b/src/expr/metakind_template.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file metakind_template.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/expr/node.cpp b/src/expr/node.cpp
index 78085ba8c..30f7ce8b9 100644
--- a/src/expr/node.cpp
+++ b/src/expr/node.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file node.cpp
** \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/expr/node.h b/src/expr/node.h
index 5857eedcb..7003aae87 100644
--- a/src/expr/node.h
+++ b/src/expr/node.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file node.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>, Tim King <taking@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Francois Bobot, Tim King, Clark Barrett, Christopher L. Conway
** 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/expr/node_builder.h b/src/expr/node_builder.h
index bd3827f47..773828ccb 100644
--- a/src/expr/node_builder.h
+++ b/src/expr/node_builder.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file node_builder.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>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Tim King, Christopher L. Conway
** 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/expr/node_manager.cpp b/src/expr/node_manager.cpp
index d0a58b5d8..cc890b9b9 100644
--- a/src/expr/node_manager.cpp
+++ b/src/expr/node_manager.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file node_manager.cpp
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): ACSYS <cvc4-devel@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Christopher L. Conway, Morgan Deters
+ ** Minor contributors (to current version): ACSYS, 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/expr/node_manager.h b/src/expr/node_manager.h
index 4706d8872..0c62d31c5 100644
--- a/src/expr/node_manager.h
+++ b/src/expr/node_manager.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file node_manager.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): ACSYS <cvc4-devel@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>, Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Christopher L. Conway, Morgan Deters
+ ** Minor contributors (to current version): ACSYS, Tim King, Kshitij Bansal
** 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/expr/node_self_iterator.h b/src/expr/node_self_iterator.h
index a4977f817..e1cca1aef 100644
--- a/src/expr/node_self_iterator.h
+++ b/src/expr/node_self_iterator.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file node_self_iterator.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/expr/node_value.cpp b/src/expr/node_value.cpp
index 452ac85d1..ed7a8add3 100644
--- a/src/expr/node_value.cpp
+++ b/src/expr/node_value.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file node_value.cpp
** \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/expr/node_value.h b/src/expr/node_value.h
index aa6491c9c..13fdc6a7f 100644
--- a/src/expr/node_value.h
+++ b/src/expr/node_value.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file node_value.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Christopher L. Conway <christopherleeconway@gmail.com>, Tim King <taking@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Minor contributors (to current version): Christopher L. Conway, 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/expr/options_handlers.h b/src/expr/options_handlers.h
index a111c5d96..1959c10c4 100644
--- a/src/expr/options_handlers.h
+++ b/src/expr/options_handlers.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file options_handlers.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/expr/pickle_data.cpp b/src/expr/pickle_data.cpp
index f329a4dad..e80e20fc8 100644
--- a/src/expr/pickle_data.cpp
+++ b/src/expr/pickle_data.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file pickle_data.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/expr/pickle_data.h b/src/expr/pickle_data.h
index 29ddb8c80..b9c20f27a 100644
--- a/src/expr/pickle_data.h
+++ b/src/expr/pickle_data.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file pickle_data.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/expr/pickler.cpp b/src/expr/pickler.cpp
index 8cd3140c0..065805a65 100644
--- a/src/expr/pickler.cpp
+++ b/src/expr/pickler.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file pickler.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Minor contributors (to current version): Tim King, Kshitij Bansal
** 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/expr/pickler.h b/src/expr/pickler.h
index bedfd212a..afaf72600 100644
--- a/src/expr/pickler.h
+++ b/src/expr/pickler.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file pickler.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Minor contributors (to current version): Kshitij Bansal
** 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/expr/symbol_table.cpp b/src/expr/symbol_table.cpp
index 05c344777..e36219a81 100644
--- a/src/expr/symbol_table.cpp
+++ b/src/expr/symbol_table.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file symbol_table.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>, François Bobot <francois@bobot.eu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Christopher L. Conway
+ ** Minor contributors (to current version): Andrew Reynolds, Dejan Jovanovic, 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/expr/symbol_table.h b/src/expr/symbol_table.h
index 464d00376..63a7e299b 100644
--- a/src/expr/symbol_table.h
+++ b/src/expr/symbol_table.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file symbol_table.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>, François Bobot <francois@bobot.eu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Christopher L. Conway
+ ** Minor contributors (to current version): Andrew Reynolds, Dejan Jovanovic, 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/expr/type.cpp b/src/expr/type.cpp
index 020b18a6c..71c25bd50 100644
--- a/src/expr/type.cpp
+++ b/src/expr/type.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file type.cpp
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: Dejan Jovanovic, Morgan Deters
+ ** Minor contributors (to current version): Andrew Reynolds
** 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/expr/type.h b/src/expr/type.h
index 5a4a59fb2..5e4e86264 100644
--- a/src/expr/type.h
+++ b/src/expr/type.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file type.h
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: Dejan Jovanovic, Morgan Deters
+ ** Minor contributors (to current version): Andrew Reynolds
** 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/expr/type_checker.h b/src/expr/type_checker.h
index 25764bf70..ac461bb7b 100644
--- a/src/expr/type_checker.h
+++ b/src/expr/type_checker.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file type_checker.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/expr/type_checker_template.cpp b/src/expr/type_checker_template.cpp
index 69e52ba95..aa7039f52 100644
--- a/src/expr/type_checker_template.cpp
+++ b/src/expr/type_checker_template.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file type_checker_template.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): lianah <lianahady@gmail.com>
+ ** Minor contributors (to current version): lianah
** 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/expr/type_node.cpp b/src/expr/type_node.cpp
index 003e26cb7..e654b5d71 100644
--- a/src/expr/type_node.cpp
+++ b/src/expr/type_node.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file type_node.cpp
** \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): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Tim King, Morgan Deters
+ ** Minor contributors (to current version): Andrew Reynolds, Clark Barrett
** 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/expr/type_node.h b/src/expr/type_node.h
index 9e3b4deda..35d630a91 100644
--- a/src/expr/type_node.h
+++ b/src/expr/type_node.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file type_node.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Clark Barrett, Andrew Reynolds, 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/expr/type_properties_template.h b/src/expr/type_properties_template.h
index 8e251302d..fc68fcf8c 100644
--- a/src/expr/type_properties_template.h
+++ b/src/expr/type_properties_template.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file type_properties_template.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/expr/variable_type_map.h b/src/expr/variable_type_map.h
index cbafcfc31..416850622 100644
--- a/src/expr/variable_type_map.h
+++ b/src/expr/variable_type_map.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file variable_type_map.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/include/cvc4.h b/src/include/cvc4.h
index efe5dc09a..22217c685 100644
--- a/src/include/cvc4.h
+++ b/src/include/cvc4.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file cvc4.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/include/cvc4_private.h b/src/include/cvc4_private.h
index f2f1fbd9a..31a5852d0 100644
--- a/src/include/cvc4_private.h
+++ b/src/include/cvc4_private.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file cvc4_private.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/include/cvc4_private_library.h b/src/include/cvc4_private_library.h
index df3a3945d..b04160a81 100644
--- a/src/include/cvc4_private_library.h
+++ b/src/include/cvc4_private_library.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file cvc4_private_library.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/include/cvc4_public.h b/src/include/cvc4_public.h
index c1204fc8d..b8c30aeef 100644
--- a/src/include/cvc4_public.h
+++ b/src/include/cvc4_public.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file cvc4_public.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/include/cvc4parser_private.h b/src/include/cvc4parser_private.h
index 95b3225fd..bb5ffdbba 100644
--- a/src/include/cvc4parser_private.h
+++ b/src/include/cvc4parser_private.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file cvc4parser_private.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/include/cvc4parser_public.h b/src/include/cvc4parser_public.h
index 04a7046d2..e09181bd0 100644
--- a/src/include/cvc4parser_public.h
+++ b/src/include/cvc4parser_public.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file cvc4parser_public.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/lib/clock_gettime.c b/src/lib/clock_gettime.c
index ce257e039..b2322884c 100644
--- a/src/lib/clock_gettime.c
+++ b/src/lib/clock_gettime.c
@@ -1,7 +1,7 @@
/********************* */
/*! \file clock_gettime.c
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/lib/clock_gettime.h b/src/lib/clock_gettime.h
index 29d62fe2b..2d3455aed 100644
--- a/src/lib/clock_gettime.h
+++ b/src/lib/clock_gettime.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file clock_gettime.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/lib/ffs.c b/src/lib/ffs.c
index 0c06bf7f3..abbbf1e1d 100644
--- a/src/lib/ffs.c
+++ b/src/lib/ffs.c
@@ -1,7 +1,7 @@
/********************* */
/*! \file ffs.c
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/lib/ffs.h b/src/lib/ffs.h
index 8aad4d602..212e3c9dd 100644
--- a/src/lib/ffs.h
+++ b/src/lib/ffs.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file ffs.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/lib/replacements.h b/src/lib/replacements.h
index f12d7b818..7db0171ec 100644
--- a/src/lib/replacements.h
+++ b/src/lib/replacements.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file replacements.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/lib/strtok_r.c b/src/lib/strtok_r.c
index 13d388f79..203d126c1 100644
--- a/src/lib/strtok_r.c
+++ b/src/lib/strtok_r.c
@@ -1,7 +1,7 @@
/********************* */
/*! \file strtok_r.c
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/lib/strtok_r.h b/src/lib/strtok_r.h
index 1c3101ee3..b76a4a1b5 100644
--- a/src/lib/strtok_r.h
+++ b/src/lib/strtok_r.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file strtok_r.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/main/command_executor.cpp b/src/main/command_executor.cpp
index 7bb2c144a..f1742b549 100644
--- a/src/main/command_executor.cpp
+++ b/src/main/command_executor.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file command_executor.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Kshitij Bansal
** 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/main/command_executor.h b/src/main/command_executor.h
index 3421aa3f1..f1b8d8f2f 100644
--- a/src/main/command_executor.h
+++ b/src/main/command_executor.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file command_executor.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Kshitij Bansal
** 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/main/command_executor_portfolio.cpp b/src/main/command_executor_portfolio.cpp
index 9109a7a06..63f689d48 100644
--- a/src/main/command_executor_portfolio.cpp
+++ b/src/main/command_executor_portfolio.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file command_executor_portfolio.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Kshitij Bansal
** 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/main/command_executor_portfolio.h b/src/main/command_executor_portfolio.h
index 666bf4762..a8d4a4213 100644
--- a/src/main/command_executor_portfolio.h
+++ b/src/main/command_executor_portfolio.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file command_executor_portfolio.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Kshitij Bansal
** 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/main/driver_unified.cpp b/src/main/driver_unified.cpp
index 5cd8ce8a8..f57d4f2d7 100644
--- a/src/main/driver_unified.cpp
+++ b/src/main/driver_unified.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file driver_unified.cpp
** \verbatim
- ** Original author: Kshitij Bansal <kshitij@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>
+ ** Original author: Kshitij Bansal
+ ** Major contributors: 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/main/interactive_shell.cpp b/src/main/interactive_shell.cpp
index 78bae8930..3376e9d0b 100644
--- a/src/main/interactive_shell.cpp
+++ b/src/main/interactive_shell.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file interactive_shell.cpp
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: 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/main/interactive_shell.h b/src/main/interactive_shell.h
index d3adad81d..62d0ceeda 100644
--- a/src/main/interactive_shell.h
+++ b/src/main/interactive_shell.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file interactive_shell.h
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** 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/main/main.cpp b/src/main/main.cpp
index c4bf3e108..7b61b48aa 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file main.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Christopher L. Conway
+ ** Minor contributors (to current version): Clark Barrett, 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/main/main.h b/src/main/main.h
index 265c0b958..0180c34d2 100644
--- a/src/main/main.h
+++ b/src/main/main.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file main.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/main/options_handlers.h b/src/main/options_handlers.h
index cc9586d94..07f19905b 100644
--- a/src/main/options_handlers.h
+++ b/src/main/options_handlers.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file options_handlers.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/main/portfolio.cpp b/src/main/portfolio.cpp
index d42fcd37f..263458247 100644
--- a/src/main/portfolio.cpp
+++ b/src/main/portfolio.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file portfolio.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Kshitij Bansal
** 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/main/portfolio.h b/src/main/portfolio.h
index 8e74b489d..61a4c055f 100644
--- a/src/main/portfolio.h
+++ b/src/main/portfolio.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file portfolio.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Minor contributors (to current version): Kshitij Bansal
** 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/main/portfolio_util.cpp b/src/main/portfolio_util.cpp
index e753c5916..a2d0ff700 100644
--- a/src/main/portfolio_util.cpp
+++ b/src/main/portfolio_util.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file portfolio_util.cpp
** \verbatim
- ** Original author: Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Original author: Kshitij Bansal
** 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/main/portfolio_util.h b/src/main/portfolio_util.h
index 6d1d91bb8..6f6e2f03b 100644
--- a/src/main/portfolio_util.h
+++ b/src/main/portfolio_util.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file portfolio_util.h
** \verbatim
- ** Original author: Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Original author: Kshitij Bansal
** 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/main/util.cpp b/src/main/util.cpp
index 1e3e2794d..5bd0c9bd4 100644
--- a/src/main/util.cpp
+++ b/src/main/util.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file util.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Christopher L. Conway <christopherleeconway@gmail.com>, Tim King <taking@cs.nyu.edu>, ACSYS <cvc4-devel@cs.nyu.edu>
+ ** Minor contributors (to current version): Christopher L. Conway, Tim King, ACSYS
** 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/options/base_options_handlers.h b/src/options/base_options_handlers.h
index 4c8b3eb21..a161b6c07 100644
--- a/src/options/base_options_handlers.h
+++ b/src/options/base_options_handlers.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file base_options_handlers.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/options/base_options_template.cpp b/src/options/base_options_template.cpp
index a5cee0cb2..b6a320cce 100644
--- a/src/options/base_options_template.cpp
+++ b/src/options/base_options_template.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file base_options_template.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/options/base_options_template.h b/src/options/base_options_template.h
index abb7f0456..daf62659c 100644
--- a/src/options/base_options_template.h
+++ b/src/options/base_options_template.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file base_options_template.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/options/option_exception.h b/src/options/option_exception.h
index be4d423aa..b085835b6 100644
--- a/src/options/option_exception.h
+++ b/src/options/option_exception.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file option_exception.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/options/options.h b/src/options/options.h
index 4e3f8e06a..2be0e7b51 100644
--- a/src/options/options.h
+++ b/src/options/options.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file options.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/options/options_holder_template.h b/src/options/options_holder_template.h
index 619ae1a7f..8738d7b51 100644
--- a/src/options/options_holder_template.h
+++ b/src/options/options_holder_template.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file options_holder_template.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/options/options_template.cpp b/src/options/options_template.cpp
index 92f425f0b..81ffe1b27 100644
--- a/src/options/options_template.cpp
+++ b/src/options/options_template.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file options_template.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/parser/antlr_input.cpp b/src/parser/antlr_input.cpp
index 6fa6c7ca3..cd622b8a6 100644
--- a/src/parser/antlr_input.cpp
+++ b/src/parser/antlr_input.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file antlr_input.cpp
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: 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/parser/antlr_input.h b/src/parser/antlr_input.h
index 06f8b5c8d..3b7d53be8 100644
--- a/src/parser/antlr_input.h
+++ b/src/parser/antlr_input.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file antlr_input.h
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, François Bobot <francois@bobot.eu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Tim King, Francois Bobot, 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/parser/antlr_line_buffered_input.cpp b/src/parser/antlr_line_buffered_input.cpp
index a237dc146..c2f73d988 100644
--- a/src/parser/antlr_line_buffered_input.cpp
+++ b/src/parser/antlr_line_buffered_input.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file antlr_line_buffered_input.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/parser/antlr_line_buffered_input.h b/src/parser/antlr_line_buffered_input.h
index 2fc22a090..a8522e49f 100644
--- a/src/parser/antlr_line_buffered_input.h
+++ b/src/parser/antlr_line_buffered_input.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file antlr_line_buffered_input.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/parser/antlr_tracing.h b/src/parser/antlr_tracing.h
index bf0aa49bc..8fabb2db1 100644
--- a/src/parser/antlr_tracing.h
+++ b/src/parser/antlr_tracing.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file antlr_tracing.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/parser/bounded_token_buffer.cpp b/src/parser/bounded_token_buffer.cpp
index d514aa708..88a7c6463 100644
--- a/src/parser/bounded_token_buffer.cpp
+++ b/src/parser/bounded_token_buffer.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file bounded_token_buffer.cpp
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Christopher L. Conway
** 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/parser/bounded_token_buffer.h b/src/parser/bounded_token_buffer.h
index 762c371e5..a0b7f5ea3 100644
--- a/src/parser/bounded_token_buffer.h
+++ b/src/parser/bounded_token_buffer.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file bounded_token_buffer.h
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** 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/parser/bounded_token_factory.cpp b/src/parser/bounded_token_factory.cpp
index a7e1690e1..b88b09e8b 100644
--- a/src/parser/bounded_token_factory.cpp
+++ b/src/parser/bounded_token_factory.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file bounded_token_factory.cpp
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** 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/parser/bounded_token_factory.h b/src/parser/bounded_token_factory.h
index d3597f251..c447700da 100644
--- a/src/parser/bounded_token_factory.h
+++ b/src/parser/bounded_token_factory.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file bounded_token_factory.h
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** 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/parser/cvc/Cvc.g b/src/parser/cvc/Cvc.g
index d378f4710..217e7ab97 100644
--- a/src/parser/cvc/Cvc.g
+++ b/src/parser/cvc/Cvc.g
@@ -1,9 +1,9 @@
/* ******************* */
/*! \file Cvc.g
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Tim King, Andrew Reynolds, 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/parser/cvc/cvc_input.cpp b/src/parser/cvc/cvc_input.cpp
index 70e87c5e6..64c22b25a 100644
--- a/src/parser/cvc/cvc_input.cpp
+++ b/src/parser/cvc/cvc_input.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file cvc_input.cpp
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** 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/parser/cvc/cvc_input.h b/src/parser/cvc/cvc_input.h
index 631267803..832eefe5d 100644
--- a/src/parser/cvc/cvc_input.h
+++ b/src/parser/cvc/cvc_input.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file cvc_input.h
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: Morgan Deters
+ ** 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/parser/input.cpp b/src/parser/input.cpp
index f22570ef0..156a94e2e 100644
--- a/src/parser/input.cpp
+++ b/src/parser/input.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file input.cpp
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: Morgan Deters
+ ** 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/parser/input.h b/src/parser/input.h
index af37c2fb7..a05e93e23 100644
--- a/src/parser/input.h
+++ b/src/parser/input.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file input.h
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: 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/parser/memory_mapped_input_buffer.cpp b/src/parser/memory_mapped_input_buffer.cpp
index 7477c9145..27e37864d 100644
--- a/src/parser/memory_mapped_input_buffer.cpp
+++ b/src/parser/memory_mapped_input_buffer.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file memory_mapped_input_buffer.cpp
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** 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/parser/memory_mapped_input_buffer.h b/src/parser/memory_mapped_input_buffer.h
index 881c01458..2dd1f6ffd 100644
--- a/src/parser/memory_mapped_input_buffer.h
+++ b/src/parser/memory_mapped_input_buffer.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file memory_mapped_input_buffer.h
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** 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/parser/parser.cpp b/src/parser/parser.cpp
index 444d02ecc..198d1cc31 100644
--- a/src/parser/parser.cpp
+++ b/src/parser/parser.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file parser.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>, François Bobot <francois@bobot.eu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Christopher L. Conway
+ ** Minor contributors (to current version): Tim King, Dejan Jovanovic, Francois Bobot, Andrew Reynolds
** 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/parser/parser.h b/src/parser/parser.h
index 7db3f48b3..1ca56dc06 100644
--- a/src/parser/parser.h
+++ b/src/parser/parser.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file parser.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, François Bobot <francois@bobot.eu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Christopher L. Conway
+ ** Minor contributors (to current version): Dejan Jovanovic, Francois Bobot, Andrew Reynolds
** 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/parser/parser_builder.cpp b/src/parser/parser_builder.cpp
index b2cc1aadc..721337c9e 100644
--- a/src/parser/parser_builder.cpp
+++ b/src/parser/parser_builder.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file parser_builder.cpp
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, François Bobot <francois@bobot.eu>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Dejan Jovanovic, 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/parser/parser_builder.h b/src/parser/parser_builder.h
index 4e220461c..75e2b4fbe 100644
--- a/src/parser/parser_builder.h
+++ b/src/parser/parser_builder.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file parser_builder.h
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** 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/parser/parser_exception.h b/src/parser/parser_exception.h
index 0197781fa..cf1bff1c0 100644
--- a/src/parser/parser_exception.h
+++ b/src/parser/parser_exception.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file parser_exception.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Christopher L. Conway
** 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/parser/smt1/Smt1.g b/src/parser/smt1/Smt1.g
index a40f867a6..ee4e19689 100644
--- a/src/parser/smt1/Smt1.g
+++ b/src/parser/smt1/Smt1.g
@@ -1,9 +1,9 @@
/* ******************* */
/*! \file Smt1.g
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>, Christopher L. Conway <christopherleeconway@gmail.com>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic, Christopher L. Conway
+ ** Minor contributors (to current version): Andrew Reynolds, 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/parser/smt1/smt1.cpp b/src/parser/smt1/smt1.cpp
index 1ae6587d8..41b0523bd 100644
--- a/src/parser/smt1/smt1.cpp
+++ b/src/parser/smt1/smt1.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file smt1.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>, Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Christopher L. Conway
+ ** Minor contributors (to current version): Tim King, Dejan Jovanovic, Clark Barrett
** 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/parser/smt1/smt1.h b/src/parser/smt1/smt1.h
index 2a83b2e2b..d6961371a 100644
--- a/src/parser/smt1/smt1.h
+++ b/src/parser/smt1/smt1.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file smt1.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Christopher L. Conway
+ ** Minor contributors (to current version): Clark Barrett
** 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/parser/smt1/smt1_input.cpp b/src/parser/smt1/smt1_input.cpp
index 74a4a6e1a..be2420cad 100644
--- a/src/parser/smt1/smt1_input.cpp
+++ b/src/parser/smt1/smt1_input.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file smt1_input.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Christopher L. Conway
** 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/parser/smt1/smt1_input.h b/src/parser/smt1/smt1_input.h
index d0eabb3f7..c303aea7b 100644
--- a/src/parser/smt1/smt1_input.h
+++ b/src/parser/smt1/smt1_input.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file smt1_input.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Christopher L. Conway
** 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/parser/smt2/Smt2.g b/src/parser/smt2/Smt2.g
index e738267cd..8dcde2483 100644
--- a/src/parser/smt2/Smt2.g
+++ b/src/parser/smt2/Smt2.g
@@ -1,9 +1,9 @@
/* ******************* */
/*! \file Smt2.g
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Andrew Reynolds <andrew.j.reynolds@gmail.com>, François Bobot <francois@bobot.eu>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Dejan Jovanovic, Andrew Reynolds, 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/parser/smt2/smt2.cpp b/src/parser/smt2/smt2.cpp
index 32459a357..a7f7796cd 100644
--- a/src/parser/smt2/smt2.cpp
+++ b/src/parser/smt2/smt2.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file smt2.cpp
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Clark Barrett
** 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/parser/smt2/smt2.h b/src/parser/smt2/smt2.h
index fa5ea9500..5762ff5f9 100644
--- a/src/parser/smt2/smt2.h
+++ b/src/parser/smt2/smt2.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file smt2.h
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** 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/parser/smt2/smt2_input.cpp b/src/parser/smt2/smt2_input.cpp
index 8aac6b8f9..5b376a9b8 100644
--- a/src/parser/smt2/smt2_input.cpp
+++ b/src/parser/smt2/smt2_input.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file smt2_input.cpp
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** 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/parser/smt2/smt2_input.h b/src/parser/smt2/smt2_input.h
index 8f5562a15..c7ff31ed4 100644
--- a/src/parser/smt2/smt2_input.h
+++ b/src/parser/smt2/smt2_input.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file smt2_input.h
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** 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/parser/tptp/Tptp.g b/src/parser/tptp/Tptp.g
index f8515fdad..80736caa5 100644
--- a/src/parser/tptp/Tptp.g
+++ b/src/parser/tptp/Tptp.g
@@ -1,9 +1,9 @@
/* ******************* */
/*! \file Tptp.g
** \verbatim
- ** Original author: François Bobot <francois@bobot.eu>
+ ** Original author: Francois Bobot
** 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/parser/tptp/tptp.cpp b/src/parser/tptp/tptp.cpp
index 825792811..ee7ee4c61 100644
--- a/src/parser/tptp/tptp.cpp
+++ b/src/parser/tptp/tptp.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file tptp.cpp
** \verbatim
- ** Original author: François Bobot <francois@bobot.eu>
+ ** Original author: Francois Bobot
** 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/parser/tptp/tptp.h b/src/parser/tptp/tptp.h
index 4185de991..adaca892f 100644
--- a/src/parser/tptp/tptp.h
+++ b/src/parser/tptp/tptp.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file tptp.h
** \verbatim
- ** Original author: François Bobot <francois@bobot.eu>
+ ** Original author: Francois Bobot
** Major contributors: none
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Andrew Reynolds, 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/parser/tptp/tptp_input.cpp b/src/parser/tptp/tptp_input.cpp
index 44d18013c..34a620187 100644
--- a/src/parser/tptp/tptp_input.cpp
+++ b/src/parser/tptp/tptp_input.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file tptp_input.cpp
** \verbatim
- ** Original author: François Bobot <francois@bobot.eu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Francois Bobot
+ ** 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/parser/tptp/tptp_input.h b/src/parser/tptp/tptp_input.h
index 7799de6e5..19e928e7e 100644
--- a/src/parser/tptp/tptp_input.h
+++ b/src/parser/tptp/tptp_input.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file tptp_input.h
** \verbatim
- ** Original author: François Bobot <francois@bobot.eu>
+ ** Original author: Francois Bobot
** 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/printer/ast/ast_printer.cpp b/src/printer/ast/ast_printer.cpp
index a25195f1c..57462c9f7 100644
--- a/src/printer/ast/ast_printer.cpp
+++ b/src/printer/ast/ast_printer.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file ast_printer.cpp
** \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>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Minor contributors (to current version): Dejan Jovanovic, Andrew Reynolds
** 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/printer/ast/ast_printer.h b/src/printer/ast/ast_printer.h
index 3fbe3884c..c9ee6071d 100644
--- a/src/printer/ast/ast_printer.h
+++ b/src/printer/ast/ast_printer.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file ast_printer.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/printer/cvc/cvc_printer.cpp b/src/printer/cvc/cvc_printer.cpp
index bad711efc..23c4727f3 100644
--- a/src/printer/cvc/cvc_printer.cpp
+++ b/src/printer/cvc/cvc_printer.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file cvc_printer.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>, lianah <lianahady@gmail.com>, Clark Barrett <barrett@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Francois Bobot, lianah, Clark Barrett, Tim King, Andrew Reynolds
** 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/printer/cvc/cvc_printer.h b/src/printer/cvc/cvc_printer.h
index 9d8ab93be..49b70b012 100644
--- a/src/printer/cvc/cvc_printer.h
+++ b/src/printer/cvc/cvc_printer.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file cvc_printer.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/printer/dagification_visitor.cpp b/src/printer/dagification_visitor.cpp
index 5c3158369..091d216d8 100644
--- a/src/printer/dagification_visitor.cpp
+++ b/src/printer/dagification_visitor.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file dagification_visitor.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Minor contributors (to current version): Andrew Reynolds
** 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/printer/dagification_visitor.h b/src/printer/dagification_visitor.h
index 7c58b2246..e14da1cdb 100644
--- a/src/printer/dagification_visitor.h
+++ b/src/printer/dagification_visitor.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file dagification_visitor.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/printer/model_format_mode.cpp b/src/printer/model_format_mode.cpp
index 605262f9f..a8f946a8d 100644
--- a/src/printer/model_format_mode.cpp
+++ b/src/printer/model_format_mode.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file model_format_mode.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
** 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/printer/model_format_mode.h b/src/printer/model_format_mode.h
index fa35f968a..c729c6e5d 100644
--- a/src/printer/model_format_mode.h
+++ b/src/printer/model_format_mode.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file model_format_mode.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
** 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/printer/options_handlers.h b/src/printer/options_handlers.h
index b4de57e71..97d0e64c9 100644
--- a/src/printer/options_handlers.h
+++ b/src/printer/options_handlers.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file options_handlers.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/printer/printer.cpp b/src/printer/printer.cpp
index 4a7aec637..2a10ae451 100644
--- a/src/printer/printer.cpp
+++ b/src/printer/printer.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file printer.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, François Bobot <francois@bobot.eu>
+ ** Minor contributors (to current version): Andrew Reynolds, 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/printer/printer.h b/src/printer/printer.h
index 047120ed7..48a041d6a 100644
--- a/src/printer/printer.h
+++ b/src/printer/printer.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file printer.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>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Minor contributors (to current version): Clark Barrett, Andrew Reynolds
** 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/printer/smt1/smt1_printer.cpp b/src/printer/smt1/smt1_printer.cpp
index 0130b4d89..f62709988 100644
--- a/src/printer/smt1/smt1_printer.cpp
+++ b/src/printer/smt1/smt1_printer.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file smt1_printer.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Minor contributors (to current version): Andrew Reynolds
** 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/printer/smt1/smt1_printer.h b/src/printer/smt1/smt1_printer.h
index 6d63d3902..185d23699 100644
--- a/src/printer/smt1/smt1_printer.h
+++ b/src/printer/smt1/smt1_printer.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file smt1_printer.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/printer/smt2/smt2_printer.cpp b/src/printer/smt2/smt2_printer.cpp
index 22ae43c14..722d2604b 100644
--- a/src/printer/smt2/smt2_printer.cpp
+++ b/src/printer/smt2/smt2_printer.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file smt2_printer.cpp
** \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>, lianah <lianahady@gmail.com>, Tim King <taking@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>, François Bobot <francois@bobot.eu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Minor contributors (to current version): Dejan Jovanovic, lianah, Tim King, Liana Hadarean, Francois Bobot, Andrew Reynolds
** 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/printer/smt2/smt2_printer.h b/src/printer/smt2/smt2_printer.h
index e6ae9b976..76ec39258 100644
--- a/src/printer/smt2/smt2_printer.h
+++ b/src/printer/smt2/smt2_printer.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file smt2_printer.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/proof/cnf_proof.cpp b/src/proof/cnf_proof.cpp
index 3bb1c7dcc..d6e493c8d 100644
--- a/src/proof/cnf_proof.cpp
+++ b/src/proof/cnf_proof.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file cnf_proof.cpp
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** 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/proof/cnf_proof.h b/src/proof/cnf_proof.h
index 6913a3d57..c265e46df 100644
--- a/src/proof/cnf_proof.h
+++ b/src/proof/cnf_proof.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file cnf_proof.h
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** 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/proof/proof.h b/src/proof/proof.h
index 9eb3eb4fc..02f8f7684 100644
--- a/src/proof/proof.h
+++ b/src/proof/proof.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file proof.h
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** 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/proof/proof_manager.cpp b/src/proof/proof_manager.cpp
index f4cbf39e8..e03e9058b 100644
--- a/src/proof/proof_manager.cpp
+++ b/src/proof/proof_manager.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file proof_manager.cpp
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** 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/proof/proof_manager.h b/src/proof/proof_manager.h
index d8ad6c7f7..efd39a118 100644
--- a/src/proof/proof_manager.h
+++ b/src/proof/proof_manager.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file proof_manager.h
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** 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/proof/sat_proof.cpp b/src/proof/sat_proof.cpp
index 154b47cda..df695c2d1 100644
--- a/src/proof/sat_proof.cpp
+++ b/src/proof/sat_proof.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file sat_proof.cpp
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
+ ** Original author: Liana Hadarean
** 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/proof/sat_proof.h b/src/proof/sat_proof.h
index 832d71fe6..d497a4eba 100644
--- a/src/proof/sat_proof.h
+++ b/src/proof/sat_proof.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file sat_proof.h
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** 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/prop/cnf_stream.cpp b/src/prop/cnf_stream.cpp
index 2b8d65e29..983669da3 100644
--- a/src/prop/cnf_stream.cpp
+++ b/src/prop/cnf_stream.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file cnf_stream.cpp
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Kshitij Bansal <kshitij@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters, Dejan Jovanovic
+ ** Minor contributors (to current version): Kshitij Bansal, Liana Hadarean, Christopher L. Conway
** 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/prop/cnf_stream.h b/src/prop/cnf_stream.h
index 526a61b14..cbcca5e85 100644
--- a/src/prop/cnf_stream.h
+++ b/src/prop/cnf_stream.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file cnf_stream.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters, Dejan Jovanovic
+ ** Minor contributors (to current version): Clark Barrett, Liana Hadarean, Christopher L. Conway
** 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/prop/options_handlers.h b/src/prop/options_handlers.h
index 1879fffa5..31d567ac4 100644
--- a/src/prop/options_handlers.h
+++ b/src/prop/options_handlers.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file options_handlers.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/prop/prop_engine.cpp b/src/prop/prop_engine.cpp
index 5cca714ae..c465ed97a 100644
--- a/src/prop/prop_engine.cpp
+++ b/src/prop/prop_engine.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file prop_engine.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>, Kshitij Bansal <kshitij@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Clark Barrett, Liana Hadarean, Kshitij Bansal, Christopher L. Conway, 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/prop/prop_engine.h b/src/prop/prop_engine.h
index 2cb0cd297..39182204c 100644
--- a/src/prop/prop_engine.h
+++ b/src/prop/prop_engine.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file prop_engine.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>, Christopher L. Conway <christopherleeconway@gmail.com>, Kshitij Bansal <kshitij@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Clark Barrett, Liana Hadarean, Christopher L. Conway, Kshitij Bansal, 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/prop/registrar.h b/src/prop/registrar.h
index ed8a78bd5..0cb3accf1 100644
--- a/src/prop/registrar.h
+++ b/src/prop/registrar.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file registrar.h
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Tim King <taking@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** 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/prop/sat_solver.h b/src/prop/sat_solver.h
index 436da65e7..d55788298 100644
--- a/src/prop/sat_solver.h
+++ b/src/prop/sat_solver.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file sat_solver.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters, Liana Hadarean
** 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/prop/sat_solver_factory.cpp b/src/prop/sat_solver_factory.cpp
index fbd1a4960..8a11f2b96 100644
--- a/src/prop/sat_solver_factory.cpp
+++ b/src/prop/sat_solver_factory.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file sat_solver_factory.cpp
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>
- ** Minor contributors (to current version): Liana Hadarean <lianahady@gmail.com>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters, Tim King
+ ** Minor contributors (to current version): Liana Hadarean
** 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/prop/sat_solver_factory.h b/src/prop/sat_solver_factory.h
index e2edfa31a..7d3a45c59 100644
--- a/src/prop/sat_solver_factory.h
+++ b/src/prop/sat_solver_factory.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file sat_solver_factory.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Dejan Jovanovic
** Major contributors: none
- ** Minor contributors (to current version): Liana Hadarean <lianahady@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Liana Hadarean, 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/prop/sat_solver_registry.cpp b/src/prop/sat_solver_registry.cpp
index f6247ed5d..111cd1836 100644
--- a/src/prop/sat_solver_registry.cpp
+++ b/src/prop/sat_solver_registry.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file sat_solver_registry.cpp
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Dejan Jovanovic
** 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/prop/sat_solver_registry.h b/src/prop/sat_solver_registry.h
index 0a88468d0..3a19bdb99 100644
--- a/src/prop/sat_solver_registry.h
+++ b/src/prop/sat_solver_registry.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file sat_solver_registry.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Dejan Jovanovic
** 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/prop/sat_solver_types.h b/src/prop/sat_solver_types.h
index 83278daf4..ab2bcda47 100644
--- a/src/prop/sat_solver_types.h
+++ b/src/prop/sat_solver_types.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file sat_solver_types.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Dejan Jovanovic
** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>, Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Minor contributors (to current version): Morgan Deters, Kshitij Bansal
** 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/prop/theory_proxy.cpp b/src/prop/theory_proxy.cpp
index efca8620a..a6908ff52 100644
--- a/src/prop/theory_proxy.cpp
+++ b/src/prop/theory_proxy.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_proxy.cpp
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Kshitij Bansal <kshitij@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>, Tim King <taking@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Kshitij Bansal, Morgan Deters
+ ** Minor contributors (to current version): Clark Barrett, Christopher L. Conway, Tim King, Liana Hadarean
** 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/prop/theory_proxy.h b/src/prop/theory_proxy.h
index 26b94a86f..5f1ea0e23 100644
--- a/src/prop/theory_proxy.h
+++ b/src/prop/theory_proxy.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_proxy.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Liana Hadarean <lianahady@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Christopher L. Conway <christopherleeconway@gmail.com>, Tim King <taking@cs.nyu.edu>, Kshitij Bansal <kshitij@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Liana Hadarean, Morgan Deters
+ ** Minor contributors (to current version): Christopher L. Conway, Tim King, Kshitij Bansal
** 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/smt/boolean_terms.cpp b/src/smt/boolean_terms.cpp
index e51a5d907..f8f2330e1 100644
--- a/src/smt/boolean_terms.cpp
+++ b/src/smt/boolean_terms.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file boolean_terms.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/smt/boolean_terms.h b/src/smt/boolean_terms.h
index 244971044..e5f18b68d 100644
--- a/src/smt/boolean_terms.h
+++ b/src/smt/boolean_terms.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file boolean_terms.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/smt/command_list.cpp b/src/smt/command_list.cpp
index 9a63af52e..fca714490 100644
--- a/src/smt/command_list.cpp
+++ b/src/smt/command_list.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file command_list.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/smt/command_list.h b/src/smt/command_list.h
index e4cdf07cf..ac0c382be 100644
--- a/src/smt/command_list.h
+++ b/src/smt/command_list.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file command_list.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/smt/logic_exception.h b/src/smt/logic_exception.h
index d0a06eabb..02c293ab4 100644
--- a/src/smt/logic_exception.h
+++ b/src/smt/logic_exception.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file logic_exception.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/smt/modal_exception.h b/src/smt/modal_exception.h
index 4de18cea9..bf463bb05 100644
--- a/src/smt/modal_exception.h
+++ b/src/smt/modal_exception.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file modal_exception.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/smt/model_postprocessor.cpp b/src/smt/model_postprocessor.cpp
index e3e332fb1..cbabc9542 100644
--- a/src/smt/model_postprocessor.cpp
+++ b/src/smt/model_postprocessor.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file model_postprocessor.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/smt/model_postprocessor.h b/src/smt/model_postprocessor.h
index fc5ddb055..952bb1bf0 100644
--- a/src/smt/model_postprocessor.h
+++ b/src/smt/model_postprocessor.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file model_postprocessor.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/smt/options_handlers.h b/src/smt/options_handlers.h
index b68c4794d..6b8d94c08 100644
--- a/src/smt/options_handlers.h
+++ b/src/smt/options_handlers.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file options_handlers.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/smt/simplification_mode.cpp b/src/smt/simplification_mode.cpp
index f9574872e..d3155313f 100644
--- a/src/smt/simplification_mode.cpp
+++ b/src/smt/simplification_mode.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file simplification_mode.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/smt/simplification_mode.h b/src/smt/simplification_mode.h
index 620c31990..6023bf518 100644
--- a/src/smt/simplification_mode.h
+++ b/src/smt/simplification_mode.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file simplification_mode.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/smt/smt_engine.cpp b/src/smt/smt_engine.cpp
index 0020bc5df..18636a486 100644
--- a/src/smt/smt_engine.cpp
+++ b/src/smt/smt_engine.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file smt_engine.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): Christopher L. Conway <christopherleeconway@gmail.com>, Liana Hadarean <lianahady@gmail.com>, Tim King <taking@cs.nyu.edu>, Kshitij Bansal <kshitij@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Clark Barrett
+ ** Minor contributors (to current version): Christopher L. Conway, Liana Hadarean, Tim King, Kshitij Bansal, Dejan Jovanovic, Andrew Reynolds
** 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/smt/smt_engine.h b/src/smt/smt_engine.h
index 79550c1b8..a22e34c21 100644
--- a/src/smt/smt_engine.h
+++ b/src/smt/smt_engine.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file smt_engine.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Tim King <taking@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>, Kshitij Bansal <kshitij@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Minor contributors (to current version): Andrew Reynolds, Tim King, Clark Barrett, Christopher L. Conway, Kshitij Bansal, 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/smt/smt_engine_scope.cpp b/src/smt/smt_engine_scope.cpp
index deac0de18..5a075280d 100644
--- a/src/smt/smt_engine_scope.cpp
+++ b/src/smt/smt_engine_scope.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file smt_engine_scope.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/smt/smt_engine_scope.h b/src/smt/smt_engine_scope.h
index 9a5878786..21644d3f4 100644
--- a/src/smt/smt_engine_scope.h
+++ b/src/smt/smt_engine_scope.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file smt_engine_scope.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/smt/smt_options_template.cpp b/src/smt/smt_options_template.cpp
index 03c9c5f52..638cf2f83 100644
--- a/src/smt/smt_options_template.cpp
+++ b/src/smt/smt_options_template.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file smt_options_template.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/arith/arith_heuristic_pivot_rule.cpp b/src/theory/arith/arith_heuristic_pivot_rule.cpp
index 6d0794d27..4fbc84892 100644
--- a/src/theory/arith/arith_heuristic_pivot_rule.cpp
+++ b/src/theory/arith/arith_heuristic_pivot_rule.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file arith_heuristic_pivot_rule.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/arith/arith_heuristic_pivot_rule.h b/src/theory/arith/arith_heuristic_pivot_rule.h
index 6c1b17a5b..a1ecc5b2c 100644
--- a/src/theory/arith/arith_heuristic_pivot_rule.h
+++ b/src/theory/arith/arith_heuristic_pivot_rule.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file arith_heuristic_pivot_rule.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/arith/arith_priority_queue.cpp b/src/theory/arith/arith_priority_queue.cpp
index d9bdde5d5..9fc30c136 100644
--- a/src/theory/arith/arith_priority_queue.cpp
+++ b/src/theory/arith/arith_priority_queue.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file arith_priority_queue.cpp
** \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/theory/arith/arith_priority_queue.h b/src/theory/arith/arith_priority_queue.h
index 695a981cb..912799dde 100644
--- a/src/theory/arith/arith_priority_queue.h
+++ b/src/theory/arith/arith_priority_queue.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file arith_priority_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/theory/arith/arith_propagation_mode.cpp b/src/theory/arith/arith_propagation_mode.cpp
index bd87bbab8..23ca96056 100644
--- a/src/theory/arith/arith_propagation_mode.cpp
+++ b/src/theory/arith/arith_propagation_mode.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file arith_propagation_mode.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/arith/arith_propagation_mode.h b/src/theory/arith/arith_propagation_mode.h
index 0d3db014e..97867043f 100644
--- a/src/theory/arith/arith_propagation_mode.h
+++ b/src/theory/arith/arith_propagation_mode.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file arith_propagation_mode.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/arith/arith_rewriter.cpp b/src/theory/arith/arith_rewriter.cpp
index 41e8c2542..aa5049ed4 100644
--- a/src/theory/arith/arith_rewriter.cpp
+++ b/src/theory/arith/arith_rewriter.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file arith_rewriter.cpp
** \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>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Minor contributors (to current version): Morgan Deters, 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/theory/arith/arith_rewriter.h b/src/theory/arith/arith_rewriter.h
index 8c9aba83e..91b4099ab 100644
--- a/src/theory/arith/arith_rewriter.h
+++ b/src/theory/arith/arith_rewriter.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file arith_rewriter.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters, Dejan Jovanovic
** 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/theory/arith/arith_static_learner.cpp b/src/theory/arith/arith_static_learner.cpp
index 551fd819b..a4dfb1fa4 100644
--- a/src/theory/arith/arith_static_learner.cpp
+++ b/src/theory/arith/arith_static_learner.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file arith_static_learner.cpp
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Tim King
+ ** Major contributors: Dejan Jovanovic, 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/theory/arith/arith_static_learner.h b/src/theory/arith/arith_static_learner.h
index 0414e2f09..c4bf92a16 100644
--- a/src/theory/arith/arith_static_learner.h
+++ b/src/theory/arith/arith_static_learner.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file arith_static_learner.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters
+ ** 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/theory/arith/arith_unate_lemma_mode.cpp b/src/theory/arith/arith_unate_lemma_mode.cpp
index b3efaf1a0..ec7e81cf3 100644
--- a/src/theory/arith/arith_unate_lemma_mode.cpp
+++ b/src/theory/arith/arith_unate_lemma_mode.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file arith_unate_lemma_mode.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/arith/arith_unate_lemma_mode.h b/src/theory/arith/arith_unate_lemma_mode.h
index 3f8214889..212ea85b1 100644
--- a/src/theory/arith/arith_unate_lemma_mode.h
+++ b/src/theory/arith/arith_unate_lemma_mode.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file arith_unate_lemma_mode.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/arith/arith_utilities.h b/src/theory/arith/arith_utilities.h
index a68eb6568..2efd895f2 100644
--- a/src/theory/arith/arith_utilities.h
+++ b/src/theory/arith/arith_utilities.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file arith_utilities.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters
+ ** 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/theory/arith/arithvar.cpp b/src/theory/arith/arithvar.cpp
index cbcdfb866..ce05383da 100644
--- a/src/theory/arith/arithvar.cpp
+++ b/src/theory/arith/arithvar.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file arithvar.cpp
** \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/theory/arith/arithvar.h b/src/theory/arith/arithvar.h
index 7e2573394..e6cecff3f 100644
--- a/src/theory/arith/arithvar.h
+++ b/src/theory/arith/arithvar.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file arithvar.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/theory/arith/arithvar_node_map.h b/src/theory/arith/arithvar_node_map.h
index 17e9a8f56..552beb82c 100644
--- a/src/theory/arith/arithvar_node_map.h
+++ b/src/theory/arith/arithvar_node_map.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file arithvar_node_map.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters
+ ** 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/theory/arith/congruence_manager.cpp b/src/theory/arith/congruence_manager.cpp
index 8af9152db..c10d59234 100644
--- a/src/theory/arith/congruence_manager.cpp
+++ b/src/theory/arith/congruence_manager.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file congruence_manager.cpp
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Dejan Jovanovic, 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/theory/arith/congruence_manager.h b/src/theory/arith/congruence_manager.h
index 5edcbe435..b0a4467bf 100644
--- a/src/theory/arith/congruence_manager.h
+++ b/src/theory/arith/congruence_manager.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file congruence_manager.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Tim King
+ ** Major contributors: Dejan Jovanovic
+ ** 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/theory/arith/constraint.cpp b/src/theory/arith/constraint.cpp
index 3132f869f..28b999852 100644
--- a/src/theory/arith/constraint.cpp
+++ b/src/theory/arith/constraint.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file constraint.cpp
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Dejan Jovanovic, 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/theory/arith/constraint.h b/src/theory/arith/constraint.h
index 26af01e63..e1c55f113 100644
--- a/src/theory/arith/constraint.h
+++ b/src/theory/arith/constraint.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file constraint.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/theory/arith/constraint_forward.h b/src/theory/arith/constraint_forward.h
index 65c950ab5..f01c64b60 100644
--- a/src/theory/arith/constraint_forward.h
+++ b/src/theory/arith/constraint_forward.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file constraint_forward.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/theory/arith/delta_rational.cpp b/src/theory/arith/delta_rational.cpp
index b6394887d..811658df8 100644
--- a/src/theory/arith/delta_rational.cpp
+++ b/src/theory/arith/delta_rational.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file delta_rational.cpp
** \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/theory/arith/delta_rational.h b/src/theory/arith/delta_rational.h
index 2a280f634..e97bde555 100644
--- a/src/theory/arith/delta_rational.h
+++ b/src/theory/arith/delta_rational.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file delta_rational.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Dejan Jovanovic, 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/theory/arith/dio_solver.cpp b/src/theory/arith/dio_solver.cpp
index e090e5b62..a0a932bb4 100644
--- a/src/theory/arith/dio_solver.cpp
+++ b/src/theory/arith/dio_solver.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file dio_solver.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Tim King <taking@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Tim King
+ ** 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/theory/arith/dio_solver.h b/src/theory/arith/dio_solver.h
index 87e9f5215..b940bce76 100644
--- a/src/theory/arith/dio_solver.h
+++ b/src/theory/arith/dio_solver.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file dio_solver.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/theory/arith/linear_equality.cpp b/src/theory/arith/linear_equality.cpp
index 81501fc53..7229eba95 100644
--- a/src/theory/arith/linear_equality.cpp
+++ b/src/theory/arith/linear_equality.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file linear_equality.cpp
** \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/theory/arith/linear_equality.h b/src/theory/arith/linear_equality.h
index 39da88faa..14df8d819 100644
--- a/src/theory/arith/linear_equality.h
+++ b/src/theory/arith/linear_equality.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file linear_equality.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/theory/arith/matrix.cpp b/src/theory/arith/matrix.cpp
index 3ddc73666..9fee74324 100644
--- a/src/theory/arith/matrix.cpp
+++ b/src/theory/arith/matrix.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file matrix.cpp
** \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/theory/arith/matrix.h b/src/theory/arith/matrix.h
index 9d4cee0e1..51c2114a0 100644
--- a/src/theory/arith/matrix.h
+++ b/src/theory/arith/matrix.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file matrix.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/theory/arith/normal_form.cpp b/src/theory/arith/normal_form.cpp
index b0c225461..8454ca210 100644
--- a/src/theory/arith/normal_form.cpp
+++ b/src/theory/arith/normal_form.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file normal_form.cpp
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Dejan Jovanovic, 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/theory/arith/normal_form.h b/src/theory/arith/normal_form.h
index 24d295fb5..bcf9cbfa4 100644
--- a/src/theory/arith/normal_form.h
+++ b/src/theory/arith/normal_form.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file normal_form.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Dejan Jovanovic, 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/theory/arith/options_handlers.h b/src/theory/arith/options_handlers.h
index 06c367687..1e2ab379a 100644
--- a/src/theory/arith/options_handlers.h
+++ b/src/theory/arith/options_handlers.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file options_handlers.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/arith/partial_model.cpp b/src/theory/arith/partial_model.cpp
index 33ce5dcdf..6bbaa1e5e 100644
--- a/src/theory/arith/partial_model.cpp
+++ b/src/theory/arith/partial_model.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file partial_model.cpp
** \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/theory/arith/partial_model.h b/src/theory/arith/partial_model.h
index f3cf5164b..820b1b909 100644
--- a/src/theory/arith/partial_model.h
+++ b/src/theory/arith/partial_model.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file partial_model.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/theory/arith/simplex.cpp b/src/theory/arith/simplex.cpp
index 8f8a9b261..ea8fefc6f 100644
--- a/src/theory/arith/simplex.cpp
+++ b/src/theory/arith/simplex.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file simplex.cpp
** \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/theory/arith/simplex.h b/src/theory/arith/simplex.h
index a1f451059..a20920257 100644
--- a/src/theory/arith/simplex.h
+++ b/src/theory/arith/simplex.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file simplex.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
** Major contributors: none
- ** Minor contributors (to current version): Kshitij Bansal <kshitij@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Kshitij Bansal, 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/theory/arith/theory_arith.cpp b/src/theory/arith/theory_arith.cpp
index 0ed10d4aa..8c31c02ac 100644
--- a/src/theory/arith/theory_arith.cpp
+++ b/src/theory/arith/theory_arith.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_arith.cpp
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
** Major contributors: none
- ** Minor contributors (to current version): Kshitij Bansal <kshitij@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Minor contributors (to current version): Kshitij Bansal, Andrew Reynolds, Morgan Deters, 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/theory/arith/theory_arith.h b/src/theory/arith/theory_arith.h
index a63a0bbb3..0e5a7e7e4 100644
--- a/src/theory/arith/theory_arith.h
+++ b/src/theory/arith/theory_arith.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_arith.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Tim King <taking@cs.nyu.edu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Tim King
+ ** Minor contributors (to current version): Andrew Reynolds, 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/theory/arith/theory_arith_type_rules.h b/src/theory/arith/theory_arith_type_rules.h
index 32def6116..cc8451f8b 100644
--- a/src/theory/arith/theory_arith_type_rules.h
+++ b/src/theory/arith/theory_arith_type_rules.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file theory_arith_type_rules.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Tim King <taking@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Tim King, Christopher L. Conway, 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/theory/arith/type_enumerator.h b/src/theory/arith/type_enumerator.h
index dc6ff4b1f..30cfe20cd 100644
--- a/src/theory/arith/type_enumerator.h
+++ b/src/theory/arith/type_enumerator.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file type_enumerator.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/arrays/array_info.cpp b/src/theory/arrays/array_info.cpp
index da34b8a8b..293713aab 100644
--- a/src/theory/arrays/array_info.cpp
+++ b/src/theory/arrays/array_info.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file array_info.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/theory/arrays/array_info.h b/src/theory/arrays/array_info.h
index 69f2957ed..1f97c02ca 100644
--- a/src/theory/arrays/array_info.h
+++ b/src/theory/arrays/array_info.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file array_info.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>, Clark Barrett <barrett@cs.nyu.edu>
+ ** Minor contributors (to current version): Dejan Jovanovic, Clark Barrett
** 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/theory/arrays/static_fact_manager.cpp b/src/theory/arrays/static_fact_manager.cpp
index e220d279b..cc9bd9991 100644
--- a/src/theory/arrays/static_fact_manager.cpp
+++ b/src/theory/arrays/static_fact_manager.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file static_fact_manager.cpp
** \verbatim
- ** Original author: Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Clark Barrett
** 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/theory/arrays/static_fact_manager.h b/src/theory/arrays/static_fact_manager.h
index 3ced3db6d..74011ad92 100644
--- a/src/theory/arrays/static_fact_manager.h
+++ b/src/theory/arrays/static_fact_manager.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file static_fact_manager.h
** \verbatim
- ** Original author: Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Clark Barrett
** 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/theory/arrays/theory_arrays.cpp b/src/theory/arrays/theory_arrays.cpp
index 7b727c35b..53cdd3fdc 100644
--- a/src/theory/arrays/theory_arrays.cpp
+++ b/src/theory/arrays/theory_arrays.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_arrays.cpp
** \verbatim
- ** Original author: Clark Barrett <barrett@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Clark Barrett
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Tim King, Andrew Reynolds, 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/theory/arrays/theory_arrays.h b/src/theory/arrays/theory_arrays.h
index b82d30cbf..39fd90012 100644
--- a/src/theory/arrays/theory_arrays.h
+++ b/src/theory/arrays/theory_arrays.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_arrays.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>, Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic, Clark Barrett
+ ** Minor contributors (to current version): Tim King, Andrew Reynolds
** 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/theory/arrays/theory_arrays_model.cpp b/src/theory/arrays/theory_arrays_model.cpp
index ec2bacc4b..b5c81ef69 100644
--- a/src/theory/arrays/theory_arrays_model.cpp
+++ b/src/theory/arrays/theory_arrays_model.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file theory_arrays_model.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/arrays/theory_arrays_model.h b/src/theory/arrays/theory_arrays_model.h
index c82c7635d..66dc80568 100644
--- a/src/theory/arrays/theory_arrays_model.h
+++ b/src/theory/arrays/theory_arrays_model.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file theory_arrays_model.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/arrays/theory_arrays_rewriter.h b/src/theory/arrays/theory_arrays_rewriter.h
index b1e8ea664..18bbef8cf 100644
--- a/src/theory/arrays/theory_arrays_rewriter.h
+++ b/src/theory/arrays/theory_arrays_rewriter.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_arrays_rewriter.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters, Clark Barrett
+ ** Minor contributors (to current version): Andrew Reynolds
** 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/theory/arrays/theory_arrays_type_rules.h b/src/theory/arrays/theory_arrays_type_rules.h
index 8c833bc75..b16b62f69 100644
--- a/src/theory/arrays/theory_arrays_type_rules.h
+++ b/src/theory/arrays/theory_arrays_type_rules.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_arrays_type_rules.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Clark Barrett
+ ** Minor contributors (to current version): Christopher L. Conway
** 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/theory/arrays/type_enumerator.h b/src/theory/arrays/type_enumerator.h
index f7d8b3637..bde7eef85 100644
--- a/src/theory/arrays/type_enumerator.h
+++ b/src/theory/arrays/type_enumerator.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file type_enumerator.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Clark Barrett
** 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/theory/arrays/union_find.cpp b/src/theory/arrays/union_find.cpp
index ad9dc2f5d..78305f00a 100644
--- a/src/theory/arrays/union_find.cpp
+++ b/src/theory/arrays/union_find.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file union_find.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/arrays/union_find.h b/src/theory/arrays/union_find.h
index b86805a72..29e7c82c0 100644
--- a/src/theory/arrays/union_find.h
+++ b/src/theory/arrays/union_find.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file union_find.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/booleans/boolean_term_conversion_mode.cpp b/src/theory/booleans/boolean_term_conversion_mode.cpp
index 305c41125..958fd3f23 100644
--- a/src/theory/booleans/boolean_term_conversion_mode.cpp
+++ b/src/theory/booleans/boolean_term_conversion_mode.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file boolean_term_conversion_mode.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/booleans/boolean_term_conversion_mode.h b/src/theory/booleans/boolean_term_conversion_mode.h
index e36cc0af1..c40684bbc 100644
--- a/src/theory/booleans/boolean_term_conversion_mode.h
+++ b/src/theory/booleans/boolean_term_conversion_mode.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file boolean_term_conversion_mode.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/booleans/circuit_propagator.cpp b/src/theory/booleans/circuit_propagator.cpp
index d4755d8c4..834b094f3 100644
--- a/src/theory/booleans/circuit_propagator.cpp
+++ b/src/theory/booleans/circuit_propagator.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file circuit_propagator.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
** 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/theory/booleans/circuit_propagator.h b/src/theory/booleans/circuit_propagator.h
index 0e45a53c8..360efea80 100644
--- a/src/theory/booleans/circuit_propagator.h
+++ b/src/theory/booleans/circuit_propagator.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file circuit_propagator.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Tim King, Clark Barrett
** 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/theory/booleans/options_handlers.h b/src/theory/booleans/options_handlers.h
index d06fac0d0..614003047 100644
--- a/src/theory/booleans/options_handlers.h
+++ b/src/theory/booleans/options_handlers.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file options_handlers.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/booleans/theory_bool.cpp b/src/theory/booleans/theory_bool.cpp
index 7bcedfdce..3e75dd258 100644
--- a/src/theory/booleans/theory_bool.cpp
+++ b/src/theory/booleans/theory_bool.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file theory_bool.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
** 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/theory/booleans/theory_bool.h b/src/theory/booleans/theory_bool.h
index e41f95c52..49bf905c0 100644
--- a/src/theory/booleans/theory_bool.h
+++ b/src/theory/booleans/theory_bool.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_bool.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/theory/booleans/theory_bool_rewriter.cpp b/src/theory/booleans/theory_bool_rewriter.cpp
index 911b49ea0..d6aa51aba 100644
--- a/src/theory/booleans/theory_bool_rewriter.cpp
+++ b/src/theory/booleans/theory_bool_rewriter.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_bool_rewriter.cpp
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Tim King <taking@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Tim King, Clark Barrett
+ ** 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/theory/booleans/theory_bool_rewriter.h b/src/theory/booleans/theory_bool_rewriter.h
index 33f24b6d1..96bd2ae29 100644
--- a/src/theory/booleans/theory_bool_rewriter.h
+++ b/src/theory/booleans/theory_bool_rewriter.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file theory_bool_rewriter.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/theory/booleans/theory_bool_type_rules.h b/src/theory/booleans/theory_bool_type_rules.h
index 38d8da259..38c394622 100644
--- a/src/theory/booleans/theory_bool_type_rules.h
+++ b/src/theory/booleans/theory_bool_type_rules.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_bool_type_rules.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Christopher L. Conway, 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/theory/booleans/type_enumerator.h b/src/theory/booleans/type_enumerator.h
index 5d5509fb8..ff0d50ee0 100644
--- a/src/theory/booleans/type_enumerator.h
+++ b/src/theory/booleans/type_enumerator.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file type_enumerator.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/builtin/theory_builtin.cpp b/src/theory/builtin/theory_builtin.cpp
index c1e5a044e..49908c5db 100644
--- a/src/theory/builtin/theory_builtin.cpp
+++ b/src/theory/builtin/theory_builtin.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_builtin.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Minor contributors (to current version): Andrew Reynolds
** 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/theory/builtin/theory_builtin.h b/src/theory/builtin/theory_builtin.h
index b40aa289f..b49147c91 100644
--- a/src/theory/builtin/theory_builtin.h
+++ b/src/theory/builtin/theory_builtin.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file theory_builtin.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/builtin/theory_builtin_rewriter.cpp b/src/theory/builtin/theory_builtin_rewriter.cpp
index 846c6b23a..4d62ce511 100644
--- a/src/theory/builtin/theory_builtin_rewriter.cpp
+++ b/src/theory/builtin/theory_builtin_rewriter.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file theory_builtin_rewriter.cpp
** \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/theory/builtin/theory_builtin_rewriter.h b/src/theory/builtin/theory_builtin_rewriter.h
index 198cea40c..a76bafe81 100644
--- a/src/theory/builtin/theory_builtin_rewriter.h
+++ b/src/theory/builtin/theory_builtin_rewriter.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file theory_builtin_rewriter.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/theory/builtin/theory_builtin_type_rules.h b/src/theory/builtin/theory_builtin_type_rules.h
index 1eba0da9a..2a4e07528 100644
--- a/src/theory/builtin/theory_builtin_type_rules.h
+++ b/src/theory/builtin/theory_builtin_type_rules.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_builtin_type_rules.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>, Christopher L. Conway <christopherleeconway@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Minor contributors (to current version): Tim King, Andrew Reynolds, Christopher L. Conway, 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/theory/builtin/type_enumerator.h b/src/theory/builtin/type_enumerator.h
index 493ddc535..21eca0b21 100644
--- a/src/theory/builtin/type_enumerator.h
+++ b/src/theory/builtin/type_enumerator.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file type_enumerator.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/bv/bitblast_strategies.cpp b/src/theory/bv/bitblast_strategies.cpp
index 265523c18..bc7da8786 100644
--- a/src/theory/bv/bitblast_strategies.cpp
+++ b/src/theory/bv/bitblast_strategies.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file bitblast_strategies.cpp
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
+ ** Original author: Liana Hadarean
** Major contributors: none
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>, lianah <lianahady@gmail.com>, Tim King <taking@cs.nyu.edu>
+ ** Minor contributors (to current version): Clark Barrett, Dejan Jovanovic, Morgan Deters, lianah, 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/theory/bv/bitblast_strategies.h b/src/theory/bv/bitblast_strategies.h
index 3d9ba5936..cb29e430b 100644
--- a/src/theory/bv/bitblast_strategies.h
+++ b/src/theory/bv/bitblast_strategies.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file bitblast_strategies.h
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
+ ** Original author: Liana Hadarean
** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Dejan Jovanovic, 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/theory/bv/bitblaster.cpp b/src/theory/bv/bitblaster.cpp
index 5f99e33db..cf841bb56 100644
--- a/src/theory/bv/bitblaster.cpp
+++ b/src/theory/bv/bitblaster.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file bitblaster.cpp
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>, lianah <lianahady@gmail.com>
+ ** Original author: Liana Hadarean
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Clark Barrett, Morgan Deters, lianah
** 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/theory/bv/bitblaster.h b/src/theory/bv/bitblaster.h
index d4ba482ed..2c52a2670 100644
--- a/src/theory/bv/bitblaster.h
+++ b/src/theory/bv/bitblaster.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file bitblaster.h
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
+ ** Original author: Liana Hadarean
** Major contributors: none
- ** Minor contributors (to current version): lianah <lianahady@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Minor contributors (to current version): lianah, Morgan Deters, 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/theory/bv/bv_inequality_graph.cpp b/src/theory/bv/bv_inequality_graph.cpp
index 760a38a16..ccdfc1583 100644
--- a/src/theory/bv/bv_inequality_graph.cpp
+++ b/src/theory/bv/bv_inequality_graph.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file bv_inequality_graph.cpp
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: lianah <lianahady@gmail.com>
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** Major contributors: lianah
+ ** 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/theory/bv/bv_inequality_graph.h b/src/theory/bv/bv_inequality_graph.h
index fcb48ed61..200c49195 100644
--- a/src/theory/bv/bv_inequality_graph.h
+++ b/src/theory/bv/bv_inequality_graph.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file bv_inequality_graph.h
** \verbatim
- ** Original author: lianah <lianahady@gmail.com>
- ** Major contributors: Liana Hadarean <lianahady@gmail.com>
+ ** Original author: lianah
+ ** Major contributors: Liana Hadarean
** 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/theory/bv/bv_subtheory.h b/src/theory/bv/bv_subtheory.h
index ea0eedabb..8374a3f75 100644
--- a/src/theory/bv/bv_subtheory.h
+++ b/src/theory/bv/bv_subtheory.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file bv_subtheory.h
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>, lianah <lianahady@gmail.com>
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** Major contributors: Dejan Jovanovic, lianah
+ ** 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/theory/bv/bv_subtheory_bitblast.cpp b/src/theory/bv/bv_subtheory_bitblast.cpp
index 1fbab8514..237b04172 100644
--- a/src/theory/bv/bv_subtheory_bitblast.cpp
+++ b/src/theory/bv/bv_subtheory_bitblast.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file bv_subtheory_bitblast.cpp
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: lianah <lianahady@gmail.com>
- ** Minor contributors (to current version): Dejan Jovanović <dejan@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: lianah
+ ** Minor contributors (to current version): Liana Hadarean, 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/theory/bv/bv_subtheory_bitblast.h b/src/theory/bv/bv_subtheory_bitblast.h
index d295b0ee7..1eef61daf 100644
--- a/src/theory/bv/bv_subtheory_bitblast.h
+++ b/src/theory/bv/bv_subtheory_bitblast.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file bv_subtheory_bitblast.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, lianah <lianahady@gmail.com>
- ** Minor contributors (to current version): Dejan Jovanović <dejan@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters, lianah
+ ** Minor contributors (to current version): Liana Hadarean
** 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/theory/bv/bv_subtheory_core.cpp b/src/theory/bv/bv_subtheory_core.cpp
index 5853eed50..a1c8f0e9a 100644
--- a/src/theory/bv/bv_subtheory_core.cpp
+++ b/src/theory/bv/bv_subtheory_core.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file bv_subtheory_core.cpp
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: lianah <lianahady@gmail.com>
+ ** Original author: Liana Hadarean
+ ** Major contributors: lianah
** 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/theory/bv/bv_subtheory_core.h b/src/theory/bv/bv_subtheory_core.h
index a460c91fa..423408a7c 100644
--- a/src/theory/bv/bv_subtheory_core.h
+++ b/src/theory/bv/bv_subtheory_core.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file bv_subtheory_core.h
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: lianah <lianahady@gmail.com>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Liana Hadarean
+ ** Major contributors: lianah
+ ** 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/theory/bv/bv_subtheory_inequality.cpp b/src/theory/bv/bv_subtheory_inequality.cpp
index 15b51d2c8..40093f070 100644
--- a/src/theory/bv/bv_subtheory_inequality.cpp
+++ b/src/theory/bv/bv_subtheory_inequality.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file bv_subtheory_inequality.cpp
** \verbatim
- ** Original author: lianah <lianahady@gmail.com>
- ** Major contributors: Liana Hadarean <lianahady@gmail.com>
+ ** Original author: lianah
+ ** Major contributors: Liana Hadarean
** 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/theory/bv/bv_subtheory_inequality.h b/src/theory/bv/bv_subtheory_inequality.h
index d79ea6e1c..390a329ff 100644
--- a/src/theory/bv/bv_subtheory_inequality.h
+++ b/src/theory/bv/bv_subtheory_inequality.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file bv_subtheory_inequality.h
** \verbatim
- ** Original author: lianah <lianahady@gmail.com>
+ ** Original author: lianah
** Major contributors: none
- ** Minor contributors (to current version): Liana Hadarean <lianahady@gmail.com>
+ ** Minor contributors (to current version): Liana Hadarean
** 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/theory/bv/cd_set_collection.h b/src/theory/bv/cd_set_collection.h
index 518043ec0..01aeeab91 100644
--- a/src/theory/bv/cd_set_collection.h
+++ b/src/theory/bv/cd_set_collection.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file cd_set_collection.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Dejan Jovanovic
** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Tim King, 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/theory/bv/slicer.cpp b/src/theory/bv/slicer.cpp
index fd344aed5..e8e4ff84b 100644
--- a/src/theory/bv/slicer.cpp
+++ b/src/theory/bv/slicer.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file slicer.cpp
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: lianah <lianahady@gmail.com>
+ ** Original author: Liana Hadarean
+ ** Major contributors: lianah
** 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/theory/bv/slicer.h b/src/theory/bv/slicer.h
index 7da12fc6d..fefbad756 100644
--- a/src/theory/bv/slicer.h
+++ b/src/theory/bv/slicer.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file slicer.h
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: lianah <lianahady@gmail.com>
+ ** Original author: Liana Hadarean
+ ** Major contributors: lianah
** 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/theory/bv/theory_bv.cpp b/src/theory/bv/theory_bv.cpp
index 39fc68823..228a4d8a3 100644
--- a/src/theory/bv/theory_bv.cpp
+++ b/src/theory/bv/theory_bv.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_bv.cpp
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>, lianah <lianahady@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Dejan Jovanović <dejan@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>, Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters, Liana Hadarean, lianah
+ ** Minor contributors (to current version): Tim King, Andrew Reynolds, Clark Barrett
** 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/theory/bv/theory_bv.h b/src/theory/bv/theory_bv.h
index c0c8823c1..8b184f972 100644
--- a/src/theory/bv/theory_bv.h
+++ b/src/theory/bv/theory_bv.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_bv.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: lianah <lianahady@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>, Liana Hadarean <lianahady@gmail.com>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Dejan Jovanović <dejan@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: lianah, Dejan Jovanovic, Liana Hadarean
+ ** Minor contributors (to current version): Clark Barrett, Tim King, Andrew Reynolds
** 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/theory/bv/theory_bv_rewrite_rules.h b/src/theory/bv/theory_bv_rewrite_rules.h
index 4000fe77e..e9a3494f0 100644
--- a/src/theory/bv/theory_bv_rewrite_rules.h
+++ b/src/theory/bv/theory_bv_rewrite_rules.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_bv_rewrite_rules.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Liana Hadarean <lianahady@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Liana Hadarean
+ ** Minor contributors (to current version): Tim King, Clark Barrett, 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/theory/bv/theory_bv_rewrite_rules_constant_evaluation.h b/src/theory/bv/theory_bv_rewrite_rules_constant_evaluation.h
index c7ce164eb..a5368d2c9 100644
--- a/src/theory/bv/theory_bv_rewrite_rules_constant_evaluation.h
+++ b/src/theory/bv/theory_bv_rewrite_rules_constant_evaluation.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_bv_rewrite_rules_constant_evaluation.h
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): lianah <lianahady@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** Major contributors: Clark Barrett
+ ** Minor contributors (to current version): lianah, Morgan Deters, 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/theory/bv/theory_bv_rewrite_rules_core.h b/src/theory/bv/theory_bv_rewrite_rules_core.h
index e6260e074..43acfef75 100644
--- a/src/theory/bv/theory_bv_rewrite_rules_core.h
+++ b/src/theory/bv/theory_bv_rewrite_rules_core.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_bv_rewrite_rules_core.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Dejan Jovanovic
** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Tim King, Clark Barrett, Liana Hadarean, 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/theory/bv/theory_bv_rewrite_rules_normalization.h b/src/theory/bv/theory_bv_rewrite_rules_normalization.h
index 28ae9d0b3..4ba09ef67 100644
--- a/src/theory/bv/theory_bv_rewrite_rules_normalization.h
+++ b/src/theory/bv/theory_bv_rewrite_rules_normalization.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_bv_rewrite_rules_normalization.h
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** Major contributors: Clark Barrett
+ ** Minor contributors (to current version): Dejan Jovanovic, Morgan Deters, 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/theory/bv/theory_bv_rewrite_rules_operator_elimination.h b/src/theory/bv/theory_bv_rewrite_rules_operator_elimination.h
index 6f54f5a52..06ddc215d 100644
--- a/src/theory/bv/theory_bv_rewrite_rules_operator_elimination.h
+++ b/src/theory/bv/theory_bv_rewrite_rules_operator_elimination.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_bv_rewrite_rules_operator_elimination.h
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** Major contributors: Clark Barrett
+ ** Minor contributors (to current version): Morgan Deters, 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/theory/bv/theory_bv_rewrite_rules_simplification.h b/src/theory/bv/theory_bv_rewrite_rules_simplification.h
index 20e143d2f..bcfb189af 100644
--- a/src/theory/bv/theory_bv_rewrite_rules_simplification.h
+++ b/src/theory/bv/theory_bv_rewrite_rules_simplification.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_bv_rewrite_rules_simplification.h
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** Major contributors: Clark Barrett
+ ** Minor contributors (to current version): Morgan Deters, Dejan Jovanovic, 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/theory/bv/theory_bv_rewriter.cpp b/src/theory/bv/theory_bv_rewriter.cpp
index b16c426e6..a712a8391 100644
--- a/src/theory/bv/theory_bv_rewriter.cpp
+++ b/src/theory/bv/theory_bv_rewriter.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_bv_rewriter.cpp
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Liana Hadarean <lianahady@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Liana Hadarean
+ ** Minor contributors (to current version): Tim King, Morgan Deters, Clark Barrett
** 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/theory/bv/theory_bv_rewriter.h b/src/theory/bv/theory_bv_rewriter.h
index 1ef936028..183b5e8d5 100644
--- a/src/theory/bv/theory_bv_rewriter.h
+++ b/src/theory/bv/theory_bv_rewriter.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_bv_rewriter.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters, Liana Hadarean
+ ** 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/theory/bv/theory_bv_type_rules.h b/src/theory/bv/theory_bv_type_rules.h
index af331237c..00284e7ae 100644
--- a/src/theory/bv/theory_bv_type_rules.h
+++ b/src/theory/bv/theory_bv_type_rules.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file theory_bv_type_rules.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Liana Hadarean <lianahady@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Liana Hadarean, Morgan Deters, Christopher L. Conway
** 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/theory/bv/theory_bv_utils.h b/src/theory/bv/theory_bv_utils.h
index 77e36860d..dffdf10df 100644
--- a/src/theory/bv/theory_bv_utils.h
+++ b/src/theory/bv/theory_bv_utils.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_bv_utils.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: lianah <lianahady@gmail.com>, Liana Hadarean <lianahady@gmail.com>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: lianah, Liana Hadarean
+ ** Minor contributors (to current version): Clark Barrett, 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/theory/bv/type_enumerator.h b/src/theory/bv/type_enumerator.h
index b68d199ec..01741737f 100644
--- a/src/theory/bv/type_enumerator.h
+++ b/src/theory/bv/type_enumerator.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file type_enumerator.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/datatypes/datatypes_rewriter.h b/src/theory/datatypes/datatypes_rewriter.h
index c0bcf2560..bc6d1f839 100644
--- a/src/theory/datatypes/datatypes_rewriter.h
+++ b/src/theory/datatypes/datatypes_rewriter.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file datatypes_rewriter.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
** 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/theory/datatypes/theory_datatypes.cpp b/src/theory/datatypes/theory_datatypes.cpp
index 6be8b5ce8..7f96232d6 100644
--- a/src/theory/datatypes/theory_datatypes.cpp
+++ b/src/theory/datatypes/theory_datatypes.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_datatypes.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
+ ** 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/theory/datatypes/theory_datatypes.h b/src/theory/datatypes/theory_datatypes.h
index 236bc0327..e38c522c5 100644
--- a/src/theory/datatypes/theory_datatypes.h
+++ b/src/theory/datatypes/theory_datatypes.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_datatypes.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
+ ** Minor contributors (to current version): Francois Bobot, 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/theory/datatypes/theory_datatypes_type_rules.h b/src/theory/datatypes/theory_datatypes_type_rules.h
index bed697e5d..d3efc636f 100644
--- a/src/theory/datatypes/theory_datatypes_type_rules.h
+++ b/src/theory/datatypes/theory_datatypes_type_rules.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_datatypes_type_rules.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
+ ** 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/theory/datatypes/type_enumerator.h b/src/theory/datatypes/type_enumerator.h
index bc4f7736a..778304f32 100644
--- a/src/theory/datatypes/type_enumerator.h
+++ b/src/theory/datatypes/type_enumerator.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file type_enumerator.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@cs.nyu.edu>
+ ** 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/theory/example/ecdata.cpp b/src/theory/example/ecdata.cpp
index d6c87b3a0..4ed0bdb45 100644
--- a/src/theory/example/ecdata.cpp
+++ b/src/theory/example/ecdata.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file ecdata.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/example/ecdata.h b/src/theory/example/ecdata.h
index 07f4e551b..fd557a1fa 100644
--- a/src/theory/example/ecdata.h
+++ b/src/theory/example/ecdata.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file ecdata.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/example/theory_uf_tim.cpp b/src/theory/example/theory_uf_tim.cpp
index b27bb165f..03748d567 100644
--- a/src/theory/example/theory_uf_tim.cpp
+++ b/src/theory/example/theory_uf_tim.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file theory_uf_tim.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/example/theory_uf_tim.h b/src/theory/example/theory_uf_tim.h
index 8a2bb4766..64639bbfa 100644
--- a/src/theory/example/theory_uf_tim.h
+++ b/src/theory/example/theory_uf_tim.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file theory_uf_tim.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/interrupted.h b/src/theory/interrupted.h
index 39edd8461..86fbe3036 100644
--- a/src/theory/interrupted.h
+++ b/src/theory/interrupted.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file interrupted.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/ite_simplifier.cpp b/src/theory/ite_simplifier.cpp
index e799f27ef..ec9eb27d4 100644
--- a/src/theory/ite_simplifier.cpp
+++ b/src/theory/ite_simplifier.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file ite_simplifier.cpp
** \verbatim
- ** Original author: Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Clark Barrett
** 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/theory/ite_simplifier.h b/src/theory/ite_simplifier.h
index 6f787b3ff..0f648f91d 100644
--- a/src/theory/ite_simplifier.h
+++ b/src/theory/ite_simplifier.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file ite_simplifier.h
** \verbatim
- ** Original author: Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Clark Barrett
** 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/theory/logic_info.cpp b/src/theory/logic_info.cpp
index 16e8aea6c..dc9de8662 100644
--- a/src/theory/logic_info.cpp
+++ b/src/theory/logic_info.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file logic_info.cpp
** \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/theory/logic_info.h b/src/theory/logic_info.h
index 12e23fd53..c7b5c58f9 100644
--- a/src/theory/logic_info.h
+++ b/src/theory/logic_info.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file logic_info.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/theory/model.cpp b/src/theory/model.cpp
index 26cd11eac..1c511be30 100644
--- a/src/theory/model.cpp
+++ b/src/theory/model.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file model.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** Major contributors: Morgan Deters, Clark Barrett
+ ** 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/theory/model.h b/src/theory/model.h
index 15bf42895..03a641df4 100644
--- a/src/theory/model.h
+++ b/src/theory/model.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file model.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** Major contributors: Morgan Deters, Clark Barrett
+ ** 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/theory/options_handlers.h b/src/theory/options_handlers.h
index 2b6a66366..268fd46fd 100644
--- a/src/theory/options_handlers.h
+++ b/src/theory/options_handlers.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file options_handlers.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/output_channel.h b/src/theory/output_channel.h
index 0b5ee58e2..af3065404 100644
--- a/src/theory/output_channel.h
+++ b/src/theory/output_channel.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file output_channel.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>, Tim King <taking@cs.nyu.edu>
+ ** Minor contributors (to current version): Andrew Reynolds, Dejan Jovanovic, 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/theory/quantifiers/candidate_generator.cpp b/src/theory/quantifiers/candidate_generator.cpp
index 58c4d2557..0c423de19 100644
--- a/src/theory/quantifiers/candidate_generator.cpp
+++ b/src/theory/quantifiers/candidate_generator.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file candidate_generator.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/quantifiers/candidate_generator.h b/src/theory/quantifiers/candidate_generator.h
index e185b67d5..81b98ce0a 100644
--- a/src/theory/quantifiers/candidate_generator.h
+++ b/src/theory/quantifiers/candidate_generator.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file candidate_generator.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/quantifiers/first_order_model.cpp b/src/theory/quantifiers/first_order_model.cpp
index aa2e342b7..bba9c0163 100644
--- a/src/theory/quantifiers/first_order_model.cpp
+++ b/src/theory/quantifiers/first_order_model.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file first_order_model.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/first_order_model.h b/src/theory/quantifiers/first_order_model.h
index 0ccde0746..76f21e19c 100644
--- a/src/theory/quantifiers/first_order_model.h
+++ b/src/theory/quantifiers/first_order_model.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file first_order_model.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/inst_gen.cpp b/src/theory/quantifiers/inst_gen.cpp
index dea371e9c..e495b39c0 100644
--- a/src/theory/quantifiers/inst_gen.cpp
+++ b/src/theory/quantifiers/inst_gen.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file inst_gen.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/inst_gen.h b/src/theory/quantifiers/inst_gen.h
index 930133954..55afed889 100644
--- a/src/theory/quantifiers/inst_gen.h
+++ b/src/theory/quantifiers/inst_gen.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file inst_gen.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/inst_match.cpp b/src/theory/quantifiers/inst_match.cpp
index 64aa212c1..f6a0dad11 100644
--- a/src/theory/quantifiers/inst_match.cpp
+++ b/src/theory/quantifiers/inst_match.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file inst_match.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, François Bobot <francois@bobot.eu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
+ ** 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/theory/quantifiers/inst_match.h b/src/theory/quantifiers/inst_match.h
index 3a3da248c..127f83c60 100644
--- a/src/theory/quantifiers/inst_match.h
+++ b/src/theory/quantifiers/inst_match.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file inst_match.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: François Bobot <francois@bobot.eu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Francois Bobot, Andrew Reynolds
** 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/theory/quantifiers/inst_match_generator.cpp b/src/theory/quantifiers/inst_match_generator.cpp
index dd8588b52..de7f2f373 100644
--- a/src/theory/quantifiers/inst_match_generator.cpp
+++ b/src/theory/quantifiers/inst_match_generator.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file inst_match_generator.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/inst_match_generator.h b/src/theory/quantifiers/inst_match_generator.h
index b201fa60f..4c954fa81 100644
--- a/src/theory/quantifiers/inst_match_generator.h
+++ b/src/theory/quantifiers/inst_match_generator.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file inst_match_generator.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/inst_strategy_cbqi.cpp b/src/theory/quantifiers/inst_strategy_cbqi.cpp
index b12fed619..20eb7373b 100644
--- a/src/theory/quantifiers/inst_strategy_cbqi.cpp
+++ b/src/theory/quantifiers/inst_strategy_cbqi.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file inst_strategy_cbqi.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/inst_strategy_cbqi.h b/src/theory/quantifiers/inst_strategy_cbqi.h
index de548ab14..5528d70ea 100644
--- a/src/theory/quantifiers/inst_strategy_cbqi.h
+++ b/src/theory/quantifiers/inst_strategy_cbqi.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file inst_strategy_cbqi.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/inst_strategy_e_matching.cpp b/src/theory/quantifiers/inst_strategy_e_matching.cpp
index 0915f59a5..0e1266e0d 100644
--- a/src/theory/quantifiers/inst_strategy_e_matching.cpp
+++ b/src/theory/quantifiers/inst_strategy_e_matching.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file inst_strategy_e_matching.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/inst_strategy_e_matching.h b/src/theory/quantifiers/inst_strategy_e_matching.h
index 13d443c6a..c73186dbb 100644
--- a/src/theory/quantifiers/inst_strategy_e_matching.h
+++ b/src/theory/quantifiers/inst_strategy_e_matching.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file inst_strategy_e_matching.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/instantiation_engine.cpp b/src/theory/quantifiers/instantiation_engine.cpp
index e1fb29440..77df69456 100644
--- a/src/theory/quantifiers/instantiation_engine.cpp
+++ b/src/theory/quantifiers/instantiation_engine.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file instantiation_engine.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
** 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/theory/quantifiers/instantiation_engine.h b/src/theory/quantifiers/instantiation_engine.h
index eac522aa9..5f7e26297 100644
--- a/src/theory/quantifiers/instantiation_engine.h
+++ b/src/theory/quantifiers/instantiation_engine.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file instantiation_engine.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
** 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/theory/quantifiers/macros.cpp b/src/theory/quantifiers/macros.cpp
index bf67bdd25..8e1083b7b 100644
--- a/src/theory/quantifiers/macros.cpp
+++ b/src/theory/quantifiers/macros.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file macros.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/macros.h b/src/theory/quantifiers/macros.h
index 140f02966..ad5cd2e55 100644
--- a/src/theory/quantifiers/macros.h
+++ b/src/theory/quantifiers/macros.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file macros.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/model_builder.cpp b/src/theory/quantifiers/model_builder.cpp
index 310cd4eed..0b74cfc5e 100644
--- a/src/theory/quantifiers/model_builder.cpp
+++ b/src/theory/quantifiers/model_builder.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file model_builder.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Andrew Reynolds
** Major contributors: none
- ** Minor contributors (to current version): Kshitij Bansal <kshitij@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Kshitij Bansal, 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/theory/quantifiers/model_builder.h b/src/theory/quantifiers/model_builder.h
index 4df3e57b0..31448acee 100644
--- a/src/theory/quantifiers/model_builder.h
+++ b/src/theory/quantifiers/model_builder.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file model_builder.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/model_engine.cpp b/src/theory/quantifiers/model_engine.cpp
index 8af0ce501..a69b278c0 100644
--- a/src/theory/quantifiers/model_engine.cpp
+++ b/src/theory/quantifiers/model_engine.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file model_engine.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
+ ** 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/theory/quantifiers/model_engine.h b/src/theory/quantifiers/model_engine.h
index c0598dc37..386864164 100644
--- a/src/theory/quantifiers/model_engine.h
+++ b/src/theory/quantifiers/model_engine.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file model_engine.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
** 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/theory/quantifiers/modes.cpp b/src/theory/quantifiers/modes.cpp
index 6b8ea2061..7da3b150f 100644
--- a/src/theory/quantifiers/modes.cpp
+++ b/src/theory/quantifiers/modes.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file modes.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/modes.h b/src/theory/quantifiers/modes.h
index 0460cbb41..edf9c78fe 100644
--- a/src/theory/quantifiers/modes.h
+++ b/src/theory/quantifiers/modes.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file modes.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/options_handlers.h b/src/theory/quantifiers/options_handlers.h
index ba5f31d99..410578af0 100644
--- a/src/theory/quantifiers/options_handlers.h
+++ b/src/theory/quantifiers/options_handlers.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file options_handlers.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
** 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/theory/quantifiers/quant_util.cpp b/src/theory/quantifiers/quant_util.cpp
index 9e4a2a14a..36db56d0d 100644
--- a/src/theory/quantifiers/quant_util.cpp
+++ b/src/theory/quantifiers/quant_util.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file quant_util.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/quant_util.h b/src/theory/quantifiers/quant_util.h
index 187587227..6a5726cc7 100644
--- a/src/theory/quantifiers/quant_util.h
+++ b/src/theory/quantifiers/quant_util.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file quant_util.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/quantifiers_attributes.cpp b/src/theory/quantifiers/quantifiers_attributes.cpp
index b00fe45f4..5bdce5fac 100644
--- a/src/theory/quantifiers/quantifiers_attributes.cpp
+++ b/src/theory/quantifiers/quantifiers_attributes.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file quantifiers_attributes.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/quantifiers_attributes.h b/src/theory/quantifiers/quantifiers_attributes.h
index 8e8ebe97a..878d3ac50 100644
--- a/src/theory/quantifiers/quantifiers_attributes.h
+++ b/src/theory/quantifiers/quantifiers_attributes.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file quantifiers_attributes.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/quantifiers_rewriter.cpp b/src/theory/quantifiers/quantifiers_rewriter.cpp
index 94a178f83..c6379860e 100644
--- a/src/theory/quantifiers/quantifiers_rewriter.cpp
+++ b/src/theory/quantifiers/quantifiers_rewriter.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file quantifiers_rewriter.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
+ ** 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/theory/quantifiers/quantifiers_rewriter.h b/src/theory/quantifiers/quantifiers_rewriter.h
index f7250ca42..712967bd2 100644
--- a/src/theory/quantifiers/quantifiers_rewriter.h
+++ b/src/theory/quantifiers/quantifiers_rewriter.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file quantifiers_rewriter.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
** 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/theory/quantifiers/relevant_domain.cpp b/src/theory/quantifiers/relevant_domain.cpp
index a8245652e..2b011552c 100644
--- a/src/theory/quantifiers/relevant_domain.cpp
+++ b/src/theory/quantifiers/relevant_domain.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file relevant_domain.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/relevant_domain.h b/src/theory/quantifiers/relevant_domain.h
index 7e30e9d92..6fc035e8a 100644
--- a/src/theory/quantifiers/relevant_domain.h
+++ b/src/theory/quantifiers/relevant_domain.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file relevant_domain.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/term_database.cpp b/src/theory/quantifiers/term_database.cpp
index d638321c6..3153a3c64 100644
--- a/src/theory/quantifiers/term_database.cpp
+++ b/src/theory/quantifiers/term_database.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file term_database.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: François Bobot <francois@bobot.eu>
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** Major contributors: Francois Bobot
+ ** 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/theory/quantifiers/term_database.h b/src/theory/quantifiers/term_database.h
index c2bdf3cf8..231d0ee9e 100644
--- a/src/theory/quantifiers/term_database.h
+++ b/src/theory/quantifiers/term_database.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file term_database.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/quantifiers/theory_quantifiers.cpp b/src/theory/quantifiers/theory_quantifiers.cpp
index 523186a4d..9843cd09e 100644
--- a/src/theory/quantifiers/theory_quantifiers.cpp
+++ b/src/theory/quantifiers/theory_quantifiers.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_quantifiers.cpp
** \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>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Minor contributors (to current version): Dejan Jovanovic, Andrew Reynolds
** 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/theory/quantifiers/theory_quantifiers.h b/src/theory/quantifiers/theory_quantifiers.h
index 40609c445..fb599e2a0 100644
--- a/src/theory/quantifiers/theory_quantifiers.h
+++ b/src/theory/quantifiers/theory_quantifiers.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_quantifiers.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>, Dejan Jovanović <dejan.jovanovic@gmail.com>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Minor contributors (to current version): Francois Bobot, Dejan Jovanovic, Andrew Reynolds
** 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/theory/quantifiers/theory_quantifiers_type_rules.h b/src/theory/quantifiers/theory_quantifiers_type_rules.h
index d0741bd63..b13d8601e 100644
--- a/src/theory/quantifiers/theory_quantifiers_type_rules.h
+++ b/src/theory/quantifiers/theory_quantifiers_type_rules.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file theory_quantifiers_type_rules.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/quantifiers/trigger.cpp b/src/theory/quantifiers/trigger.cpp
index 630812e12..cab94fb5c 100644
--- a/src/theory/quantifiers/trigger.cpp
+++ b/src/theory/quantifiers/trigger.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file trigger.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
+ ** 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/theory/quantifiers/trigger.h b/src/theory/quantifiers/trigger.h
index 1c82f47e9..ca9124751 100644
--- a/src/theory/quantifiers/trigger.h
+++ b/src/theory/quantifiers/trigger.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file trigger.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
+ ** 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/theory/quantifiers_engine.cpp b/src/theory/quantifiers_engine.cpp
index 955f9c55f..6ec5ea2a4 100644
--- a/src/theory/quantifiers_engine.cpp
+++ b/src/theory/quantifiers_engine.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file quantifiers_engine.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
+ ** 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/theory/quantifiers_engine.h b/src/theory/quantifiers_engine.h
index 9699dc1f9..bfa19bb98 100644
--- a/src/theory/quantifiers_engine.h
+++ b/src/theory/quantifiers_engine.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file quantifiers_engine.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
+ ** 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/theory/rep_set.cpp b/src/theory/rep_set.cpp
index 2df0c3f61..f6da32bbf 100644
--- a/src/theory/rep_set.cpp
+++ b/src/theory/rep_set.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file rep_set.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/rep_set.h b/src/theory/rep_set.h
index 019f69ec2..24fa7473e 100644
--- a/src/theory/rep_set.h
+++ b/src/theory/rep_set.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file rep_set.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/rewriter.cpp b/src/theory/rewriter.cpp
index def41975b..979d5d88d 100644
--- a/src/theory/rewriter.cpp
+++ b/src/theory/rewriter.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file rewriter.cpp
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Clark Barrett
** 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/theory/rewriter.h b/src/theory/rewriter.h
index 2c1ea4c5a..4245ad6f9 100644
--- a/src/theory/rewriter.h
+++ b/src/theory/rewriter.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file rewriter.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/theory/rewriter_attributes.h b/src/theory/rewriter_attributes.h
index 73bde7c12..45e83aa63 100644
--- a/src/theory/rewriter_attributes.h
+++ b/src/theory/rewriter_attributes.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file rewriter_attributes.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/theory/rewriter_tables_template.h b/src/theory/rewriter_tables_template.h
index 8387d3975..408bdec1a 100644
--- a/src/theory/rewriter_tables_template.h
+++ b/src/theory/rewriter_tables_template.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file rewriter_tables_template.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/theory/rewriterules/efficient_e_matching.cpp b/src/theory/rewriterules/efficient_e_matching.cpp
index 5ed34d46c..a9e1cfbb5 100644
--- a/src/theory/rewriterules/efficient_e_matching.cpp
+++ b/src/theory/rewriterules/efficient_e_matching.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file efficient_e_matching.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/rewriterules/efficient_e_matching.h b/src/theory/rewriterules/efficient_e_matching.h
index 11c6b783e..b02d465fc 100644
--- a/src/theory/rewriterules/efficient_e_matching.h
+++ b/src/theory/rewriterules/efficient_e_matching.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file efficient_e_matching.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/rewriterules/rr_candidate_generator.cpp b/src/theory/rewriterules/rr_candidate_generator.cpp
index 1e072d2ad..3ebb3547c 100644
--- a/src/theory/rewriterules/rr_candidate_generator.cpp
+++ b/src/theory/rewriterules/rr_candidate_generator.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file rr_candidate_generator.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
** 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/theory/rewriterules/rr_candidate_generator.h b/src/theory/rewriterules/rr_candidate_generator.h
index 264c44334..d00c8ab83 100644
--- a/src/theory/rewriterules/rr_candidate_generator.h
+++ b/src/theory/rewriterules/rr_candidate_generator.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file rr_candidate_generator.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>, François Bobot <francois@bobot.eu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds, Francois Bobot
** 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/theory/rewriterules/rr_inst_match.cpp b/src/theory/rewriterules/rr_inst_match.cpp
index fca2780c8..a4c111f86 100644
--- a/src/theory/rewriterules/rr_inst_match.cpp
+++ b/src/theory/rewriterules/rr_inst_match.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file rr_inst_match.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: François Bobot <francois@bobot.eu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Francois Bobot
+ ** Minor contributors (to current version): Andrew Reynolds
** 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/theory/rewriterules/rr_inst_match.h b/src/theory/rewriterules/rr_inst_match.h
index 2314615cf..3ec9438fd 100644
--- a/src/theory/rewriterules/rr_inst_match.h
+++ b/src/theory/rewriterules/rr_inst_match.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file rr_inst_match.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: François Bobot <francois@bobot.eu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Francois Bobot
+ ** Minor contributors (to current version): Andrew Reynolds
** 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/theory/rewriterules/rr_inst_match_impl.h b/src/theory/rewriterules/rr_inst_match_impl.h
index f885333f6..c0dea3ba2 100644
--- a/src/theory/rewriterules/rr_inst_match_impl.h
+++ b/src/theory/rewriterules/rr_inst_match_impl.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file rr_inst_match_impl.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: François Bobot <francois@bobot.eu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Francois Bobot
+ ** Minor contributors (to current version): Andrew Reynolds
** 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/theory/rewriterules/rr_trigger.cpp b/src/theory/rewriterules/rr_trigger.cpp
index 3583772d7..7e35be7ad 100644
--- a/src/theory/rewriterules/rr_trigger.cpp
+++ b/src/theory/rewriterules/rr_trigger.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file rr_trigger.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>, François Bobot <francois@bobot.eu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds, Francois Bobot
** 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/theory/rewriterules/rr_trigger.h b/src/theory/rewriterules/rr_trigger.h
index 49c8021b1..f1a37d937 100644
--- a/src/theory/rewriterules/rr_trigger.h
+++ b/src/theory/rewriterules/rr_trigger.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file rr_trigger.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>, François Bobot <francois@bobot.eu>
- ** Minor contributors (to current version): Tianyi Liang <tianyi-liang@uiowa.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds, Francois Bobot
+ ** Minor contributors (to current version): Tianyi Liang
** 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/theory/rewriterules/theory_rewriterules.cpp b/src/theory/rewriterules/theory_rewriterules.cpp
index 4a93dc01b..0a89e2518 100644
--- a/src/theory/rewriterules/theory_rewriterules.cpp
+++ b/src/theory/rewriterules/theory_rewriterules.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_rewriterules.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: François Bobot <francois@bobot.eu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Francois Bobot
+ ** Minor contributors (to current version): Andrew Reynolds
** 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/theory/rewriterules/theory_rewriterules.h b/src/theory/rewriterules/theory_rewriterules.h
index f83e549ce..19cb3e987 100644
--- a/src/theory/rewriterules/theory_rewriterules.h
+++ b/src/theory/rewriterules/theory_rewriterules.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_rewriterules.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, François Bobot <francois@bobot.eu>
+ ** Minor contributors (to current version): Andrew Reynolds, 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/theory/rewriterules/theory_rewriterules_params.h b/src/theory/rewriterules/theory_rewriterules_params.h
index 3c3904f98..e20556ef3 100644
--- a/src/theory/rewriterules/theory_rewriterules_params.h
+++ b/src/theory/rewriterules/theory_rewriterules_params.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_rewriterules_params.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>
+ ** 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/theory/rewriterules/theory_rewriterules_preprocess.h b/src/theory/rewriterules/theory_rewriterules_preprocess.h
index a826342dd..cc24357c6 100644
--- a/src/theory/rewriterules/theory_rewriterules_preprocess.h
+++ b/src/theory/rewriterules/theory_rewriterules_preprocess.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_rewriterules_preprocess.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>
+ ** 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/theory/rewriterules/theory_rewriterules_rewriter.h b/src/theory/rewriterules/theory_rewriterules_rewriter.h
index 1eb08095a..2c90f063a 100644
--- a/src/theory/rewriterules/theory_rewriterules_rewriter.h
+++ b/src/theory/rewriterules/theory_rewriterules_rewriter.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file theory_rewriterules_rewriter.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/rewriterules/theory_rewriterules_rules.cpp b/src/theory/rewriterules/theory_rewriterules_rules.cpp
index ed549a5d3..589556802 100644
--- a/src/theory/rewriterules/theory_rewriterules_rules.cpp
+++ b/src/theory/rewriterules/theory_rewriterules_rules.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_rewriterules_rules.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: François Bobot <francois@bobot.eu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Francois Bobot
+ ** Minor contributors (to current version): Andrew Reynolds
** 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/theory/rewriterules/theory_rewriterules_rules.h b/src/theory/rewriterules/theory_rewriterules_rules.h
index 0e9360ecf..308194667 100644
--- a/src/theory/rewriterules/theory_rewriterules_rules.h
+++ b/src/theory/rewriterules/theory_rewriterules_rules.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file theory_rewriterules_rules.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/rewriterules/theory_rewriterules_type_rules.h b/src/theory/rewriterules/theory_rewriterules_type_rules.h
index 35ab30b60..256957855 100644
--- a/src/theory/rewriterules/theory_rewriterules_type_rules.h
+++ b/src/theory/rewriterules/theory_rewriterules_type_rules.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_rewriterules_type_rules.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>
+ ** 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/theory/shared_terms_database.cpp b/src/theory/shared_terms_database.cpp
index 723aca8c9..58b8cf697 100644
--- a/src/theory/shared_terms_database.cpp
+++ b/src/theory/shared_terms_database.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file shared_terms_database.cpp
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Andrew Reynolds, Clark Barrett
** 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/theory/shared_terms_database.h b/src/theory/shared_terms_database.h
index b10941b8f..944df63b2 100644
--- a/src/theory/shared_terms_database.h
+++ b/src/theory/shared_terms_database.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file shared_terms_database.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>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Tim King, Andrew Reynolds
** 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/theory/substitutions.cpp b/src/theory/substitutions.cpp
index 791abaf53..c12129d01 100644
--- a/src/theory/substitutions.cpp
+++ b/src/theory/substitutions.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file substitutions.cpp
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters, Clark Barrett
** 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/theory/substitutions.h b/src/theory/substitutions.h
index 79cfd3964..bde7dfdbc 100644
--- a/src/theory/substitutions.h
+++ b/src/theory/substitutions.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file substitutions.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Clark Barrett, Dejan Jovanovic
** 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/theory/term_registration_visitor.cpp b/src/theory/term_registration_visitor.cpp
index 56c6eb9f4..48d00130c 100644
--- a/src/theory/term_registration_visitor.cpp
+++ b/src/theory/term_registration_visitor.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file term_registration_visitor.cpp
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Clark Barrett <barrett@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Andrew Reynolds
+ ** Minor contributors (to current version): Tim King, Clark Barrett, 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/theory/term_registration_visitor.h b/src/theory/term_registration_visitor.h
index d68d69c9b..768508d2c 100644
--- a/src/theory/term_registration_visitor.h
+++ b/src/theory/term_registration_visitor.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file term_registration_visitor.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Dejan Jovanovic
** 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/theory/theory.cpp b/src/theory/theory.cpp
index 187287c71..9ed20cc99 100644
--- a/src/theory/theory.cpp
+++ b/src/theory/theory.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Clark Barrett <barrett@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Clark Barrett, Dejan Jovanovic
+ ** Minor contributors (to current version): Andrew Reynolds, 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/theory/theory.h b/src/theory/theory.h
index 517efbaca..23fd67b23 100644
--- a/src/theory/theory.h
+++ b/src/theory/theory.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>, Dejan Jovanović <dejan@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>, Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Francois Bobot, Tim King, Andrew Reynolds, Clark Barrett
** 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/theory/theory_engine.cpp b/src/theory/theory_engine.cpp
index e03c3f35c..442b1ef1c 100644
--- a/src/theory/theory_engine.cpp
+++ b/src/theory/theory_engine.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_engine.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Christopher L. Conway <christopherleeconway@gmail.com>, Kshitij Bansal <kshitij@cs.nyu.edu>, Dejan Jovanović <dejan@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>, Clark Barrett <barrett@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Christopher L. Conway, Kshitij Bansal, Tim King, Liana Hadarean, Clark Barrett, Andrew Reynolds
** 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/theory/theory_engine.h b/src/theory/theory_engine.h
index 8d5236f18..fad6c1839 100644
--- a/src/theory/theory_engine.h
+++ b/src/theory/theory_engine.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_engine.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Christopher L. Conway <christopherleeconway@gmail.com>, Dejan Jovanović <dejan@cs.nyu.edu>, François Bobot <francois@bobot.eu>, Kshitij Bansal <kshitij@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>, Clark Barrett <barrett@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Christopher L. Conway, Francois Bobot, Kshitij Bansal, Liana Hadarean, Clark Barrett, Tim King, Andrew Reynolds
** 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/theory/theory_registrar.h b/src/theory/theory_registrar.h
index dd2702eab..d77bf1eb0 100644
--- a/src/theory/theory_registrar.h
+++ b/src/theory/theory_registrar.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file theory_registrar.h
** \verbatim
- ** Original author: Liana Hadarean <lianahady@gmail.com>
- ** Major contributors: Tim King <taking@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Liana Hadarean
+ ** 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/theory/theory_test_utils.h b/src/theory/theory_test_utils.h
index 6c79a1c3f..237b09bc1 100644
--- a/src/theory/theory_test_utils.h
+++ b/src/theory/theory_test_utils.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_test_utils.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Andrew Reynolds, 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/theory/theory_traits_template.h b/src/theory/theory_traits_template.h
index ab141a7c5..d4f961eb7 100644
--- a/src/theory/theory_traits_template.h
+++ b/src/theory/theory_traits_template.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file theory_traits_template.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/theory/theoryof_mode.h b/src/theory/theoryof_mode.h
index 728dac657..cd8c68b1a 100644
--- a/src/theory/theoryof_mode.h
+++ b/src/theory/theoryof_mode.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file theoryof_mode.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/theory/type_enumerator.h b/src/theory/type_enumerator.h
index be8557d8f..7a4fcdaff 100644
--- a/src/theory/type_enumerator.h
+++ b/src/theory/type_enumerator.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file type_enumerator.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/type_enumerator_template.cpp b/src/theory/type_enumerator_template.cpp
index 712e18237..76591487a 100644
--- a/src/theory/type_enumerator_template.cpp
+++ b/src/theory/type_enumerator_template.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file type_enumerator_template.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/uf/equality_engine.cpp b/src/theory/uf/equality_engine.cpp
index 7cc81697a..7f0f79ebc 100644
--- a/src/theory/uf/equality_engine.cpp
+++ b/src/theory/uf/equality_engine.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file equality_engine.cpp
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Dejan Jovanovic
** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, François Bobot <francois@bobot.eu>, Morgan Deters <mdeters@cs.nyu.edu>, Dejan Jovanović <dejan@cs.nyu.edu>
+ ** Minor contributors (to current version): Tim King, 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/theory/uf/equality_engine.h b/src/theory/uf/equality_engine.h
index f7f803435..206fb61c7 100644
--- a/src/theory/uf/equality_engine.h
+++ b/src/theory/uf/equality_engine.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file equality_engine.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>, Liana Hadarean <lianahady@gmail.com>, Andrew Reynolds <andrew.j.reynolds@gmail.com>, Dejan Jovanović <dejan@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Tim King, Liana Hadarean, Andrew Reynolds
** 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/theory/uf/equality_engine_types.h b/src/theory/uf/equality_engine_types.h
index ed543640b..a36291974 100644
--- a/src/theory/uf/equality_engine_types.h
+++ b/src/theory/uf/equality_engine_types.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file equality_engine_types.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Dejan Jovanovic
** Major contributors: none
- ** Minor contributors (to current version): Morgan Deters <mdeters@cs.nyu.edu>, Dejan Jovanović <dejan@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/theory/uf/options_handlers.h b/src/theory/uf/options_handlers.h
index 85164a843..029db809d 100644
--- a/src/theory/uf/options_handlers.h
+++ b/src/theory/uf/options_handlers.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file options_handlers.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/uf/symmetry_breaker.cpp b/src/theory/uf/symmetry_breaker.cpp
index 032ab59cb..fcb6c3cd5 100644
--- a/src/theory/uf/symmetry_breaker.cpp
+++ b/src/theory/uf/symmetry_breaker.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file symmetry_breaker.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/uf/symmetry_breaker.h b/src/theory/uf/symmetry_breaker.h
index 7be208fdf..cf54b62c2 100644
--- a/src/theory/uf/symmetry_breaker.h
+++ b/src/theory/uf/symmetry_breaker.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file symmetry_breaker.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/theory/uf/theory_uf.cpp b/src/theory/uf/theory_uf.cpp
index 1d492003a..69a963360 100644
--- a/src/theory/uf/theory_uf.cpp
+++ b/src/theory/uf/theory_uf.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_uf.cpp
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters, Dejan Jovanovic
+ ** Minor contributors (to current version): Clark Barrett, Andrew Reynolds
** 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/theory/uf/theory_uf.h b/src/theory/uf/theory_uf.h
index f03f3e843..9ca146bde 100644
--- a/src/theory/uf/theory_uf.h
+++ b/src/theory/uf/theory_uf.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_uf.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Dejan Jovanovic, Morgan Deters
+ ** Minor contributors (to current version): Andrew Reynolds
** 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/theory/uf/theory_uf_model.cpp b/src/theory/uf/theory_uf_model.cpp
index 6e10c09dd..228cfd2c4 100644
--- a/src/theory/uf/theory_uf_model.cpp
+++ b/src/theory/uf/theory_uf_model.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_uf_model.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Clark Barrett
** 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/theory/uf/theory_uf_model.h b/src/theory/uf/theory_uf_model.h
index 2644fd517..12c1cf244 100644
--- a/src/theory/uf/theory_uf_model.h
+++ b/src/theory/uf/theory_uf_model.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file theory_uf_model.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/theory/uf/theory_uf_rewriter.h b/src/theory/uf/theory_uf_rewriter.h
index c69915f02..94ab47d23 100644
--- a/src/theory/uf/theory_uf_rewriter.h
+++ b/src/theory/uf/theory_uf_rewriter.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file theory_uf_rewriter.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/theory/uf/theory_uf_strong_solver.cpp b/src/theory/uf/theory_uf_strong_solver.cpp
index 53403dd60..d64f7df60 100644
--- a/src/theory/uf/theory_uf_strong_solver.cpp
+++ b/src/theory/uf/theory_uf_strong_solver.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_uf_strong_solver.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
+ ** Minor contributors (to current version): Clark Barrett
** 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/theory/uf/theory_uf_strong_solver.h b/src/theory/uf/theory_uf_strong_solver.h
index 6d4144dbb..0cc995723 100644
--- a/src/theory/uf/theory_uf_strong_solver.h
+++ b/src/theory/uf/theory_uf_strong_solver.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file theory_uf_strong_solver.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
** 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/theory/uf/theory_uf_type_rules.h b/src/theory/uf/theory_uf_type_rules.h
index c019a6894..b9a8ed12e 100644
--- a/src/theory/uf/theory_uf_type_rules.h
+++ b/src/theory/uf/theory_uf_type_rules.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file theory_uf_type_rules.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Christopher L. Conway <christopherleeconway@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Christopher L. Conway, Morgan Deters
+ ** Minor contributors (to current version): Andrew Reynolds, 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/theory/unconstrained_simplifier.cpp b/src/theory/unconstrained_simplifier.cpp
index 682bbf30c..9b172a561 100644
--- a/src/theory/unconstrained_simplifier.cpp
+++ b/src/theory/unconstrained_simplifier.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file unconstrained_simplifier.cpp
** \verbatim
- ** Original author: Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Clark Barrett
** 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/theory/unconstrained_simplifier.h b/src/theory/unconstrained_simplifier.h
index 66751375a..7d8e85036 100644
--- a/src/theory/unconstrained_simplifier.h
+++ b/src/theory/unconstrained_simplifier.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file unconstrained_simplifier.h
** \verbatim
- ** Original author: Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Clark Barrett
** 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/theory/valuation.cpp b/src/theory/valuation.cpp
index fdd798f22..d4aef4fff 100644
--- a/src/theory/valuation.cpp
+++ b/src/theory/valuation.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file valuation.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Clark Barrett <barrett@cs.nyu.edu>, Dejan Jovanović <dejan@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Andrew Reynolds, Clark Barrett, 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/theory/valuation.h b/src/theory/valuation.h
index 5f8994493..d175e5e3d 100644
--- a/src/theory/valuation.h
+++ b/src/theory/valuation.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file valuation.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Andrew Reynolds <andrew.j.reynolds@gmail.com>, Clark Barrett <barrett@cs.nyu.edu>, Dejan Jovanović <dejan@cs.nyu.edu>
+ ** Original author: Morgan Deters
+ ** Major contributors: Dejan Jovanovic
+ ** Minor contributors (to current version): Tim King, Andrew Reynolds, Clark Barrett
** 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/util/abstract_value.cpp b/src/util/abstract_value.cpp
index 63ae73008..3ed372848 100644
--- a/src/util/abstract_value.cpp
+++ b/src/util/abstract_value.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file abstract_value.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/abstract_value.h b/src/util/abstract_value.h
index 3a4a61106..39fd9e368 100644
--- a/src/util/abstract_value.h
+++ b/src/util/abstract_value.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file abstract_value.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/array.h b/src/util/array.h
index 22d6f2696..892e28a86 100644
--- a/src/util/array.h
+++ b/src/util/array.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file array.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/array_store_all.cpp b/src/util/array_store_all.cpp
index b9527919a..7c9086276 100644
--- a/src/util/array_store_all.cpp
+++ b/src/util/array_store_all.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file array_store_all.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/array_store_all.h b/src/util/array_store_all.h
index 6ec076cf0..6e60cc2cb 100644
--- a/src/util/array_store_all.h
+++ b/src/util/array_store_all.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file array_store_all.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/ascription_type.h b/src/util/ascription_type.h
index ecdd8f5aa..1f7ba0aaa 100644
--- a/src/util/ascription_type.h
+++ b/src/util/ascription_type.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file ascription_type.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/backtrackable.h b/src/util/backtrackable.h
index ff94e2bbc..c5844c6c4 100644
--- a/src/util/backtrackable.h
+++ b/src/util/backtrackable.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file backtrackable.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/bitvector.h b/src/util/bitvector.h
index b4088d725..2d5d29339 100644
--- a/src/util/bitvector.h
+++ b/src/util/bitvector.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file bitvector.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>
- ** Minor contributors (to current version): lianah <lianahady@gmail.com>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Morgan Deters, Liana Hadarean
+ ** Minor contributors (to current version): lianah, Christopher L. Conway
** 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/util/bool.h b/src/util/bool.h
index c7ca69544..8e3c8849c 100644
--- a/src/util/bool.h
+++ b/src/util/bool.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file bool.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/boolean_simplification.cpp b/src/util/boolean_simplification.cpp
index e6aecf84f..8e077fe1d 100644
--- a/src/util/boolean_simplification.cpp
+++ b/src/util/boolean_simplification.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file boolean_simplification.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/boolean_simplification.h b/src/util/boolean_simplification.h
index d540f2853..e5c4ead6c 100644
--- a/src/util/boolean_simplification.h
+++ b/src/util/boolean_simplification.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file boolean_simplification.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/util/cache.h b/src/util/cache.h
index 88d1bde1a..8c2f9abca 100644
--- a/src/util/cache.h
+++ b/src/util/cache.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file cache.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/cardinality.cpp b/src/util/cardinality.cpp
index 09046629a..42f8519c1 100644
--- a/src/util/cardinality.cpp
+++ b/src/util/cardinality.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file cardinality.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>
+ ** 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/util/cardinality.h b/src/util/cardinality.h
index 4f8b87331..34aa9c08b 100644
--- a/src/util/cardinality.h
+++ b/src/util/cardinality.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file cardinality.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>
+ ** 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/util/channel.h b/src/util/channel.h
index ea7214499..676371cbc 100644
--- a/src/util/channel.h
+++ b/src/util/channel.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file channel.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/configuration.cpp b/src/util/configuration.cpp
index 0ecfbd561..ba141cc58 100644
--- a/src/util/configuration.cpp
+++ b/src/util/configuration.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file configuration.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Liana Hadarean <lianahady@gmail.com>, ACSYS <cvc4-devel@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>, Dejan Jovanović <dejan.jovanovic@gmail.com>, François Bobot <francois@bobot.eu>
+ ** Minor contributors (to current version): Liana Hadarean, ACSYS, Christopher L. Conway, Dejan Jovanovic, 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/util/configuration.h b/src/util/configuration.h
index 9a642303c..a63a0d6f3 100644
--- a/src/util/configuration.h
+++ b/src/util/configuration.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file configuration.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): ACSYS <cvc4-devel@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>, François Bobot <francois@bobot.eu>
+ ** Minor contributors (to current version): ACSYS, Liana Hadarean, 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/util/configuration_private.h b/src/util/configuration_private.h
index 34e916950..272766ff4 100644
--- a/src/util/configuration_private.h
+++ b/src/util/configuration_private.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file configuration_private.h
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: ACSYS <cvc4-devel@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Liana Hadarean <lianahady@gmail.com>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: ACSYS, Morgan Deters
+ ** Minor contributors (to current version): Liana Hadarean
** 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/util/cvc4_assert.cpp b/src/util/cvc4_assert.cpp
index 0fccfb94e..eb7b81a39 100644
--- a/src/util/cvc4_assert.cpp
+++ b/src/util/cvc4_assert.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file cvc4_assert.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/cvc4_assert.h b/src/util/cvc4_assert.h
index aaf140489..c070fc389 100644
--- a/src/util/cvc4_assert.h
+++ b/src/util/cvc4_assert.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file cvc4_assert.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): ACSYS <cvc4-devel@cs.nyu.edu>
+ ** Minor contributors (to current version): ACSYS
** 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/util/datatype.cpp b/src/util/datatype.cpp
index 237cc197f..96e8692f5 100644
--- a/src/util/datatype.cpp
+++ b/src/util/datatype.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file datatype.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
** 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/util/datatype.h b/src/util/datatype.h
index ae575a377..3da441f1f 100644
--- a/src/util/datatype.h
+++ b/src/util/datatype.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file datatype.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Minor contributors (to current version): Andrew Reynolds
** 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/util/debug.h b/src/util/debug.h
index 44a7d490c..3e7c4d8be 100644
--- a/src/util/debug.h
+++ b/src/util/debug.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file debug.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/dense_map.h b/src/util/dense_map.h
index b1c8dd40c..b8acf1556 100644
--- a/src/util/dense_map.h
+++ b/src/util/dense_map.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file dense_map.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
+ ** Original author: Tim King
** Major contributors: none
- ** Minor contributors (to current version): Dejan Jovanović <dejan@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Minor contributors (to current version): Dejan Jovanovic, 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/util/dump.cpp b/src/util/dump.cpp
index c9667f695..e3baf10c5 100644
--- a/src/util/dump.cpp
+++ b/src/util/dump.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file dump.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/dump.h b/src/util/dump.h
index 58f649273..2ef6010e3 100644
--- a/src/util/dump.h
+++ b/src/util/dump.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file dump.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/dynamic_array.h b/src/util/dynamic_array.h
index a66a883fc..1f6e07cc7 100644
--- a/src/util/dynamic_array.h
+++ b/src/util/dynamic_array.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file dynamic_array.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/util/exception.cpp b/src/util/exception.cpp
index 7a2a12ea0..08405c501 100644
--- a/src/util/exception.cpp
+++ b/src/util/exception.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file exception.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/exception.h b/src/util/exception.h
index 91840addd..082a50ef2 100644
--- a/src/util/exception.h
+++ b/src/util/exception.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file exception.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/gmp_util.h b/src/util/gmp_util.h
index b52beff62..f2cd0004f 100644
--- a/src/util/gmp_util.h
+++ b/src/util/gmp_util.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file gmp_util.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/util/hash.h b/src/util/hash.h
index c86dde528..34ca8be5b 100644
--- a/src/util/hash.h
+++ b/src/util/hash.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file hash.h
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan@cs.nyu.edu>, Tim King <taking@cs.nyu.edu>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Dejan Jovanovic, 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/util/index.h b/src/util/index.h
index f34b9ab89..356dbdd8f 100644
--- a/src/util/index.h
+++ b/src/util/index.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file index.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): lianah <lianahady@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): lianah
** 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/util/integer.h.in b/src/util/integer.h.in
index 9067e2340..c3c6a70cd 100644
--- a/src/util/integer.h.in
+++ b/src/util/integer.h.in
@@ -1,8 +1,8 @@
/********************* */
/*! \file integer.h.in
** \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/util/integer_cln_imp.h b/src/util/integer_cln_imp.h
index 982bf749e..197c615e1 100644
--- a/src/util/integer_cln_imp.h
+++ b/src/util/integer_cln_imp.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file integer_cln_imp.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Liana Hadarean <lianahady@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters
+ ** Minor contributors (to current version): Dejan Jovanovic, Liana Hadarean
** 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/util/integer_gmp_imp.h b/src/util/integer_gmp_imp.h
index a292dd949..bd0556c22 100644
--- a/src/util/integer_gmp_imp.h
+++ b/src/util/integer_gmp_imp.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file integer_gmp_imp.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Liana Hadarean <lianahady@gmail.com>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters, Liana Hadarean
+ ** 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/util/ite_removal.cpp b/src/util/ite_removal.cpp
index 1330408c7..f26bbe0aa 100644
--- a/src/util/ite_removal.cpp
+++ b/src/util/ite_removal.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file ite_removal.cpp
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Andrew Reynolds, Morgan Deters
+ ** Minor contributors (to current version): Clark Barrett
** 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/util/ite_removal.h b/src/util/ite_removal.h
index c7c9025bd..03197be89 100644
--- a/src/util/ite_removal.h
+++ b/src/util/ite_removal.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file ite_removal.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Kshitij Bansal <kshitij@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Andrew Reynolds <andrew.j.reynolds@gmail.com>, Clark Barrett <barrett@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Kshitij Bansal, Morgan Deters
+ ** Minor contributors (to current version): Andrew Reynolds, Clark Barrett
** 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/util/language.cpp b/src/util/language.cpp
index 74d44e093..9cac3dd3f 100644
--- a/src/util/language.cpp
+++ b/src/util/language.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file language.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>
+ ** 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/util/language.h b/src/util/language.h
index e087a8326..b83b3d093 100644
--- a/src/util/language.h
+++ b/src/util/language.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file language.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): François Bobot <francois@bobot.eu>
+ ** 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/util/lemma_input_channel.h b/src/util/lemma_input_channel.h
index ec6e7247d..319de942c 100644
--- a/src/util/lemma_input_channel.h
+++ b/src/util/lemma_input_channel.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file lemma_input_channel.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/lemma_output_channel.h b/src/util/lemma_output_channel.h
index c1ec1e6c5..8f4f7461d 100644
--- a/src/util/lemma_output_channel.h
+++ b/src/util/lemma_output_channel.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file lemma_output_channel.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/matcher.h b/src/util/matcher.h
index 13bec9fc3..4a3233261 100644
--- a/src/util/matcher.h
+++ b/src/util/matcher.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file matcher.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
+ ** Original author: Morgan Deters
+ ** Major contributors: Andrew Reynolds
** 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/util/node_visitor.h b/src/util/node_visitor.h
index a5ea0a26a..1d2bf0b9d 100644
--- a/src/util/node_visitor.h
+++ b/src/util/node_visitor.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file node_visitor.h
** \verbatim
- ** Original author: Dejan Jovanović <dejan.jovanovic@gmail.com>
- ** Major contributors: Liana Hadarean <lianahady@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Dejan Jovanovic
+ ** Major contributors: Liana Hadarean, 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/util/ntuple.h b/src/util/ntuple.h
index b87003a06..a342a11c1 100644
--- a/src/util/ntuple.h
+++ b/src/util/ntuple.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file ntuple.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/output.cpp b/src/util/output.cpp
index 71aba1f6c..d60330b0c 100644
--- a/src/util/output.cpp
+++ b/src/util/output.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file output.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/output.h b/src/util/output.h
index dbf8b1c8a..263d5a144 100644
--- a/src/util/output.h
+++ b/src/util/output.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file output.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>, Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** 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/util/predicate.cpp b/src/util/predicate.cpp
index 75cfe9be6..1b473d5ad 100644
--- a/src/util/predicate.cpp
+++ b/src/util/predicate.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file predicate.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/predicate.h b/src/util/predicate.h
index 9010072ba..686e92dc8 100644
--- a/src/util/predicate.h
+++ b/src/util/predicate.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file predicate.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/proof.h b/src/util/proof.h
index 585c75dad..aa81d3294 100644
--- a/src/util/proof.h
+++ b/src/util/proof.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file proof.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/rational.h.in b/src/util/rational.h.in
index 2ff0b4950..c02886906 100644
--- a/src/util/rational.h.in
+++ b/src/util/rational.h.in
@@ -1,8 +1,8 @@
/********************* */
/*! \file rational.h.in
** \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/util/rational_cln_imp.cpp b/src/util/rational_cln_imp.cpp
index 0eaac26b3..2b29ece22 100644
--- a/src/util/rational_cln_imp.cpp
+++ b/src/util/rational_cln_imp.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file rational_cln_imp.cpp
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters, Christopher L. Conway
** 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/util/rational_cln_imp.h b/src/util/rational_cln_imp.h
index 885625830..476ddd544 100644
--- a/src/util/rational_cln_imp.h
+++ b/src/util/rational_cln_imp.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file rational_cln_imp.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters
+ ** 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/util/rational_gmp_imp.cpp b/src/util/rational_gmp_imp.cpp
index ba57fcfe1..d496803dc 100644
--- a/src/util/rational_gmp_imp.cpp
+++ b/src/util/rational_gmp_imp.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file rational_gmp_imp.cpp
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>, Christopher L. Conway <christopherleeconway@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters, Christopher L. Conway
** 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/util/rational_gmp_imp.h b/src/util/rational_gmp_imp.h
index be4fea749..0916b523a 100644
--- a/src/util/rational_gmp_imp.h
+++ b/src/util/rational_gmp_imp.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file rational_gmp_imp.h
** \verbatim
- ** Original author: Tim King <taking@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Tim King
+ ** Major contributors: Morgan Deters
+ ** 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/util/record.cpp b/src/util/record.cpp
index 222453b23..136f190a1 100644
--- a/src/util/record.cpp
+++ b/src/util/record.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file record.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/record.h b/src/util/record.h
index 0aab6bdc4..3d6481320 100644
--- a/src/util/record.h
+++ b/src/util/record.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file record.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/recursion_breaker.h b/src/util/recursion_breaker.h
index 5d28878e1..07bf10984 100644
--- a/src/util/recursion_breaker.h
+++ b/src/util/recursion_breaker.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file recursion_breaker.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/result.cpp b/src/util/result.cpp
index b8f940314..e0e34f07d 100644
--- a/src/util/result.cpp
+++ b/src/util/result.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file result.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>
+ ** 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/util/result.h b/src/util/result.h
index bb7418d1e..cb1bd50fa 100644
--- a/src/util/result.h
+++ b/src/util/result.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file result.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
- ** Minor contributors (to current version): Tim King <taking@cs.nyu.edu>
+ ** 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/util/sexpr.cpp b/src/util/sexpr.cpp
index a7b12c359..52d992d4b 100644
--- a/src/util/sexpr.cpp
+++ b/src/util/sexpr.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file sexpr.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/sexpr.h b/src/util/sexpr.h
index c7bdd250b..0222382b0 100644
--- a/src/util/sexpr.h
+++ b/src/util/sexpr.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file sexpr.h
** \verbatim
- ** Original author: Christopher L. Conway <christopherleeconway@gmail.com>
- ** Major contributors: Tim King <taking@cs.nyu.edu>, Morgan Deters <mdeters@cs.nyu.edu>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>
+ ** Original author: Christopher L. Conway
+ ** Major contributors: Tim King, Morgan Deters
+ ** 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/util/sort_inference.cpp b/src/util/sort_inference.cpp
index d700b70d9..d44499fa8 100644
--- a/src/util/sort_inference.cpp
+++ b/src/util/sort_inference.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file sort_inference.cpp
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/util/sort_inference.h b/src/util/sort_inference.h
index 0b1f96f85..1bcb8a208 100644
--- a/src/util/sort_inference.h
+++ b/src/util/sort_inference.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file sort_inference.h
** \verbatim
- ** Original author: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Andrew Reynolds
+ ** 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/util/statistics.cpp b/src/util/statistics.cpp
index c5215ab34..d632933b4 100644
--- a/src/util/statistics.cpp
+++ b/src/util/statistics.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file statistics.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/statistics.h b/src/util/statistics.h
index 11b2d70f7..5b9e75837 100644
--- a/src/util/statistics.h
+++ b/src/util/statistics.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file statistics.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/statistics_registry.cpp b/src/util/statistics_registry.cpp
index 8c7edfff0..f6a27e20d 100644
--- a/src/util/statistics_registry.cpp
+++ b/src/util/statistics_registry.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file statistics_registry.cpp
** \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/util/statistics_registry.h b/src/util/statistics_registry.h
index 5caddf14f..e0bc81d91 100644
--- a/src/util/statistics_registry.h
+++ b/src/util/statistics_registry.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file statistics_registry.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/util/subrange_bound.h b/src/util/subrange_bound.h
index f5b711175..82dc940ea 100644
--- a/src/util/subrange_bound.h
+++ b/src/util/subrange_bound.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file subrange_bound.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/util/tls.h.in b/src/util/tls.h.in
index a5af4a4c5..2512e481d 100644
--- a/src/util/tls.h.in
+++ b/src/util/tls.h.in
@@ -1,8 +1,8 @@
/********************* */
/*! \file tls.h.in
** \verbatim
- ** Original author: ACSYS <cvc4-devel@cs.nyu.edu>
- ** Major contributors: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: ACSYS
+ ** 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/util/trans_closure.cpp b/src/util/trans_closure.cpp
index 39aff5855..90b069485 100644
--- a/src/util/trans_closure.cpp
+++ b/src/util/trans_closure.cpp
@@ -1,9 +1,9 @@
/********************* */
/*! \file trans_closure.cpp
** \verbatim
- ** Original author: Clark Barrett <barrett@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Clark Barrett
+ ** Major contributors: Andrew Reynolds
+ ** Minor contributors (to current version): Dejan Jovanovic, 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/util/trans_closure.h b/src/util/trans_closure.h
index 459ed0d68..ce846637d 100644
--- a/src/util/trans_closure.h
+++ b/src/util/trans_closure.h
@@ -1,9 +1,9 @@
/********************* */
/*! \file trans_closure.h
** \verbatim
- ** Original author: Clark Barrett <barrett@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>
- ** Minor contributors (to current version): Dejan Jovanović <dejan.jovanovic@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Clark Barrett
+ ** Major contributors: Andrew Reynolds
+ ** Minor contributors (to current version): Dejan Jovanovic, 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/util/tuple.h b/src/util/tuple.h
index 2c5b94b7c..375a1aba3 100644
--- a/src/util/tuple.h
+++ b/src/util/tuple.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file tuple.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/uninterpreted_constant.cpp b/src/util/uninterpreted_constant.cpp
index e1f2b640b..6b98a7be8 100644
--- a/src/util/uninterpreted_constant.cpp
+++ b/src/util/uninterpreted_constant.cpp
@@ -1,7 +1,7 @@
/********************* */
/*! \file uninterpreted_constant.cpp
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/uninterpreted_constant.h b/src/util/uninterpreted_constant.h
index 2801cddc8..869491538 100644
--- a/src/util/uninterpreted_constant.h
+++ b/src/util/uninterpreted_constant.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file uninterpreted_constant.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
diff --git a/src/util/util_model.cpp b/src/util/util_model.cpp
index c64f45cd8..ab4c95ea5 100644
--- a/src/util/util_model.cpp
+++ b/src/util/util_model.cpp
@@ -1,8 +1,8 @@
/********************* */
/*! \file util_model.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/util/util_model.h b/src/util/util_model.h
index 3f1c00b36..535493a2d 100644
--- a/src/util/util_model.h
+++ b/src/util/util_model.h
@@ -1,8 +1,8 @@
/********************* */
/*! \file util_model.h
** \verbatim
- ** Original author: Clark Barrett <barrett@cs.nyu.edu>
- ** Major contributors: Andrew Reynolds <andrew.j.reynolds@gmail.com>, Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Clark Barrett
+ ** Major contributors: Andrew Reynolds, 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/util/utility.h b/src/util/utility.h
index ab3319596..9b15adecd 100644
--- a/src/util/utility.h
+++ b/src/util/utility.h
@@ -1,7 +1,7 @@
/********************* */
/*! \file utility.h
** \verbatim
- ** Original author: Morgan Deters <mdeters@cs.nyu.edu>
+ ** Original author: Morgan Deters
** Major contributors: none
** Minor contributors (to current version): none
** This file is part of the CVC4 project.
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback