summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorAntonin Descampe <antonin@gmail.com>2014-04-03 15:30:57 +0000
committerAntonin Descampe <antonin@gmail.com>2014-04-03 15:30:57 +0000
commitd19a4ab6768c48b542c0add922eba0dcddae9ffe (patch)
tree10bccab2098c5b4929e2e3eaf48ecc502cb76dae /LICENSE
parentf105cb54717cc50e49838d8ecd71efb31a8da73f (diff)
[trunk] updated copyright and added copyright notice required by ISO, in each file; updated AUTHORS, NEWS
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE11
1 files changed, 8 insertions, 3 deletions
diff --git a/LICENSE b/LICENSE
index f578e33a..e8fa4104 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,12 @@
/*
- * Copyright (c) 2002-2012, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2012, Professor Benoit Macq
- * Copyright (c) 2003-2012, Antonin Descampe
+ * 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-2014, Antonin Descampe
* Copyright (c) 2003-2009, Francois-Olivier Devaux
* Copyright (c) 2005, Herve Drolon, FreeImage Team
* Copyright (c) 2002-2003, Yannick Verschueren