version bump for 2.3

Ignore-this: 241506342a47d0b53ca11fe0e5fc493a

darcs-hash:20120720181345-c8de0-e9d90197a6b988592923025b76de60250d6577b6.gz

diff --git a/COPYRIGHT b/COPYRIGHT
index 89f66800198ab434345b72c8972088d078bca722..83c917200ceb239d6b3843b0e5e8430e38907b4f 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/NEWS b/NEWS
index 0a5b69a02a4d9590d3771fea7e86b6e6e41f2171..0f02f238952cd8703b1057d11f835539480f23c4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+NLopt 2.3 (20 July 2012)
+
+* In Matlab/Octave interface, make returning NaN from the objective
+  equivalent to nlopt_force_stop; thanks to Norman Violet for the suggestion.
+
+* Added CCSA-quadratic (NLOPT_LD_CCSAQ), similar to MMA.
+
+* Added interface for supplying a preconditioner (approximate Hessian);
+  currently only supported in CCSAQ.
+
+* When adding mconstraints, allow tol==NULL as synonym for zero tolerances.
+
+* Added missing NLOPT_LD_SLSQP constant in Matlab/Octave.
+
+* Lower tolerance for dual optimization in MMA/CCSAQ; thanks to
+  Christophe Leruste for the problem report
+
+* Fixed bug in timer, thanks to William Vaughn for the patch.
+
+* Bug fix to convergence test in sbplx; thanks to Douglas Bates.
+
 NLopt 2.2.4 (9 June 2011)
 
 * Fixed linking problem for C++ and Python shared libraries on MacOS X;

diff --git a/api/deprecated.c b/api/deprecated.c
index d1db08531e3b66ba035eb4772ff4101b8883a3d0..66fa46120ef2f936e56e44d1da8037f2e93582db 100644 (file)
--- a/api/deprecated.c
+++ b/api/deprecated.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/api/f77api.c b/api/f77api.c
index eb4afa1b75c3a71dc988ae4e788da42d3bc8a169..2898ba711b14bc482926a57828ad0c243b08db41 100644 (file)
--- a/api/f77api.c
+++ b/api/f77api.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/api/f77funcs.h b/api/f77funcs.h
index fed5bf379fb4ae35db354c421f9ea8259328d9c3..04faa9a83c643414b1b00f9e1a8a23e9717437af 100644 (file)
--- a/api/f77funcs.h
+++ b/api/f77funcs.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/api/f77funcs_.h b/api/f77funcs_.h
index f237231f134e3734b6e0ace61ffca850d3d20cf9..dad13b3f610962278f61e8a0d8df6d8e8590282a 100644 (file)
--- a/api/f77funcs_.h
+++ b/api/f77funcs_.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/api/general.c b/api/general.c
index 5ac1059d25963f090c39643cdd6b40ea07411662..8ce76d626123c3d606aa8a20c28c6ae98d934cb6 100644 (file)
--- a/api/general.c
+++ b/api/general.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/api/nlopt-internal.h b/api/nlopt-internal.h
index d41099fa01d134d2728a3951087e0a3dcedc2f6a..f205cbe04f74777960a408cc6bd52c06d9bf6974 100644 (file)
--- a/api/nlopt-internal.h
+++ b/api/nlopt-internal.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/api/nlopt.3 b/api/nlopt.3
index 8e417668f82d8ab4d2df1819b3baa60969405f73..72fafd6ae9d6c3a801664c7e35e693c3d95a9177 100644 (file)
--- a/api/nlopt.3
+++ b/api/nlopt.3
@@ -728,6 +728,6 @@ is implemented for up to 1111 dimensions.
 .SH AUTHORS
 Written by Steven G. Johnson.
 .PP
-Copyright (c) 2007-2011 Massachusetts Institute of Technology.
+Copyright (c) 2007-2012 Massachusetts Institute of Technology.
 .SH "SEE ALSO"
 nlopt_minimize(3)

diff --git a/api/nlopt.h b/api/nlopt.h
index 46584e9a745aaf3873bd1d84fc6cf7698498d9fa..e09877da7e1bbfe807459656438be2c2d3ff6ec8 100644 (file)
--- a/api/nlopt.h
+++ b/api/nlopt.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/api/nlopt_minimize_constrained.3 b/api/nlopt_minimize_constrained.3
index f908667e578169e198dfa4cfb0bfba482e73ae0f..8328420000197cb02daf321586b603c7f8f015a5 100644 (file)
--- a/api/nlopt_minimize_constrained.3
+++ b/api/nlopt_minimize_constrained.3
@@ -591,6 +591,6 @@ is implemented for up to 1111 dimensions.
 .SH AUTHORS
 Written by Steven G. Johnson.
 .PP
-Copyright (c) 2007-2011 Massachusetts Institute of Technology.
+Copyright (c) 2007-2012 Massachusetts Institute of Technology.
 .SH "SEE ALSO"
 nlopt_minimize(3)

diff --git a/api/optimize.c b/api/optimize.c
index 80059a5b08e2f0add694e7fd61bd8b8195a2f6d3..af0886fb4a93c3ecb66747b3c5a8c6eef751bb7c 100644 (file)
--- a/api/optimize.c
+++ b/api/optimize.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/api/options.c b/api/options.c
index f3a432030709a13a8bda174a6691c03a8e1ddf47..4a4936e78aa90f8779bf4b51334e775947b10af3 100644 (file)
--- a/api/options.c
+++ b/api/options.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/auglag/auglag.h b/auglag/auglag.h
index 38af4f9ed9aa66dc1d0c86ba5e5f193b7403fe93..88981bfe1fb74f63884a7349a35084546836d1b5 100644 (file)
--- a/auglag/auglag.h
+++ b/auglag/auglag.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/cdirect/cdirect.c b/cdirect/cdirect.c
index a3685a7b84dbc57ab273e4bef0d8a806076d8a8b..3cce27bb669a13772cf9de1a7d2a47b788122293 100644 (file)
--- a/cdirect/cdirect.c
+++ b/cdirect/cdirect.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/cdirect/cdirect.h b/cdirect/cdirect.h
index c7a8f5c6e4894a3d73320ad4af12e41e70d80aa0..5a3f942eab7f5ffd510cbf749170bd1de5df0682 100644 (file)
--- a/cdirect/cdirect.h
+++ b/cdirect/cdirect.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/cdirect/hybrid.c b/cdirect/hybrid.c
index 46face8c67b0c35c911d8bb19eec5ad74b084812..52abecce1b74a41c1d310cea3345d11682cc9559 100644 (file)
--- a/cdirect/hybrid.c
+++ b/cdirect/hybrid.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/configure.ac b/configure.ac
index 71d3944d86f7832f6796b7c6b48f30e33b4d3ac9..0cf08ca278f26ed27cba0d9fae25773d23795865 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(nlopt, 2.2.4, stevenj@alum.mit.edu)
+AC_INIT(nlopt, 2.3, stevenj@alum.mit.edu)
 AC_CONFIG_SRCDIR(api/nlopt.h)
-SHARED_VERSION_INFO="6:2:6" # CURRENT:REVISION:AGE
+SHARED_VERSION_INFO="7:0:7" # CURRENT:REVISION:AGE
 
 AM_INIT_AUTOMAKE(1.7)
 AM_CONFIG_HEADER(config.h)

diff --git a/cquad/cquad.h b/cquad/cquad.h
index ea0be771effc3dd985c024d11cef35b4235440ef..95a72c8366cdf2072f0c64876a8caf665fbfaf43 100644 (file)
--- a/cquad/cquad.h
+++ b/cquad/cquad.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/crs/crs.c b/crs/crs.c
index a1950c0d93186862f4e2287ea04c47ba4763f772..0ebe48e5eccb580af921d364f9ddd42e8c263d43 100644 (file)
--- a/crs/crs.c
+++ b/crs/crs.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/crs/crs.h b/crs/crs.h
index f7adaed3d10390d3b5bedda386e001c515448955..6df9f3d6ee20a2ea58142ab3e8b3174d481a3e1f 100644 (file)
--- a/crs/crs.h
+++ b/crs/crs.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/isres/isres.h b/isres/isres.h
index adc3e0a1694c319528e41c1be9f03d6e496b9241..258e82169a7a282c51d16e815b2da8a969b1f389 100644 (file)
--- a/isres/isres.h
+++ b/isres/isres.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/mlsl/mlsl.c b/mlsl/mlsl.c
index 88506a43659399770a852253dcc488d30ebb452e..be2343818aea994b509f5b88b513b7ec45b195c3 100644 (file)
--- a/mlsl/mlsl.c
+++ b/mlsl/mlsl.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/mlsl/mlsl.h b/mlsl/mlsl.h
index 85d0851ac12516ca4286264ed8949995bd2fc7ba..7e46c7fc0bdbbf36e9600fab50887e3832085318 100644 (file)
--- a/mlsl/mlsl.h
+++ b/mlsl/mlsl.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/mma/ccsa_quadratic.c b/mma/ccsa_quadratic.c
index 0ef175c4e3e6bc674e0f8000c5cc8188c55b9d50..7f9324bd35e48199914b08aaef17132231b6e20b 100644 (file)
--- a/mma/ccsa_quadratic.c
+++ b/mma/ccsa_quadratic.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/mma/mma.c b/mma/mma.c
index 249b892e0224aebfaecd55e6cbfb4018fc715877..6039bbc175e512e3d86d4d6add878896d7a8ac8a 100644 (file)
--- a/mma/mma.c
+++ b/mma/mma.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/mma/mma.h b/mma/mma.h
index 7968dc86bc99a41930dad7194986bba2db434e74..a4e6073353c87efbdc1dbd0b3808391be3f7a155 100644 (file)
--- a/mma/mma.h
+++ b/mma/mma.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/neldermead/neldermead.h b/neldermead/neldermead.h
index b741c7d462d93abebd6ebd8091095a20375172be..453046d33b4334a3a1a1de4bc0de248df80a5823 100644 (file)
--- a/neldermead/neldermead.h
+++ b/neldermead/neldermead.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/neldermead/nldrmd.c b/neldermead/nldrmd.c
index 685d3d3661207b6940de90ed99e135f3a695f10a..0fdacf8aa6ec4e091a1f25fec6128240b5957ec2 100644 (file)
--- a/neldermead/nldrmd.c
+++ b/neldermead/nldrmd.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/neldermead/sbplx.c b/neldermead/sbplx.c
index bcff9cdd116ffdc397d75230a11c4be16db29454..049a6459f9072008bb69e4fccaca0cc859f6a07c 100644 (file)
--- a/neldermead/sbplx.c
+++ b/neldermead/sbplx.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/newuoa/newuoa.c b/newuoa/newuoa.c
index e27e23cf71d00fdd11381f0648a31f18f690561c..2638999cb236142b581c048b27aeeb4f9ff2b552 100644 (file)
--- a/newuoa/newuoa.c
+++ b/newuoa/newuoa.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004 M. J. D. Powell (mjdp@cam.ac.uk)
- * Copyright (c) 2007-2011 Massachusetts Institute of Technology
+ * Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/octave/nlopt_optimize-mex.c b/octave/nlopt_optimize-mex.c
index 85819fe003fbffd4f994e8c4709596b7b77e6016..5e2df9306a0258de9c6d228bfac5707bdd457fd7 100644 (file)
--- a/octave/nlopt_optimize-mex.c
+++ b/octave/nlopt_optimize-mex.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/octave/nlopt_optimize-oct.cc b/octave/nlopt_optimize-oct.cc
index d30264e494bdd3fd5e164aa134b40ca09b041ca0..903e6c8b02f50da58f3aea0c0678e4805160c9b7 100644 (file)
--- a/octave/nlopt_optimize-oct.cc
+++ b/octave/nlopt_optimize-oct.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/util/nlopt-util.h b/util/nlopt-util.h
index ca33df4b9fb3831f9aa17f52936e86c772422728..fa60d2bb97c8d90ab2c74d1527b3016588d02896 100644 (file)
--- a/util/nlopt-util.h
+++ b/util/nlopt-util.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/util/qsort_r.c b/util/qsort_r.c
index 96a68b2dd21e6cb7aa319c9a3098ea089ddf69a1..553df83bbfa6d96ea9d0666e98fc7eb068adcaf8 100644 (file)
--- a/util/qsort_r.c
+++ b/util/qsort_r.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/util/redblack.c b/util/redblack.c
index 43b0927f5794340ffaf664a07fbb6e8de93a7405..ed9ea11274d14a6ad1f60094e68fac6ea43505e7 100644 (file)
--- a/util/redblack.c
+++ b/util/redblack.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/util/redblack.h b/util/redblack.h
index f40baf3bb34f0f05ff6f8080cd77e6f5f31ad3e0..9bb8bd031763d98ba55019799352da9f2863eb56 100644 (file)
--- a/util/redblack.h
+++ b/util/redblack.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/util/redblack_test.c b/util/redblack_test.c
index bfd785f9d8c26754b1b145266edc999f58c45f30..072930942ddf878e0256eaf7fb087db6acb356ac 100644 (file)
--- a/util/redblack_test.c
+++ b/util/redblack_test.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/util/rescale.c b/util/rescale.c
index baca89e07ff5e4d6a2be251ca416f5c62b9c3d82..11f2608e8f9e15020de2f048ff7e78ffd717755c 100644 (file)
--- a/util/rescale.c
+++ b/util/rescale.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/util/stop.c b/util/stop.c
index d052d0e356df2daa16ba5bbd3d81fbe1e3794283..94c60fefc46f1d841bd874acfe6a0f9011a95d92 100644 (file)
--- a/util/stop.c
+++ b/util/stop.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

diff --git a/util/timer.c b/util/timer.c
index 99fa34476c179dd495b40bdff3528dd77a57ff04..9b5956e895353b2d5c76ccd824900267547de4f7 100644 (file)
--- a/util/timer.c
+++ b/util/timer.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2012 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the