[2.0] Backport all changes since r2798 (included) from trunk

[openjpeg.git] / src / lib / openmj2 / mj2.c

diff --git a/src/lib/openmj2/mj2.c b/src/lib/openmj2/mj2.c
index 68afb4894cf2dbf50389ea5abc9cbe9cddb59f1e..b9034a301c8fa8accc4a7a681c6f4740d8a16b8d 100644 (file)
--- a/src/lib/openmj2/mj2.c
+++ b/src/lib/openmj2/mj2.c
@@ -1,6 +1,11 @@
 /*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
+ * The copyright in this software is being made available under the 2-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2003-2007, Francois-Olivier Devaux 
  * All rights reserved.
  *