Merge pull request #631 from OPM/dev

Copy up dev to master for release 1.5.0

ApplicationCode/Adm/LicenseInformation.txt

@@ -1,7 +1,7 @@
 ===============================================================================
  Notice for ResInsight:
 ===============================================================================
-   Copyright (C) 2011-2012 Statoil ASA, Ceetron AS
+   Copyright (C) Statoil ASA, Ceetron AS, Ceetron Solutions AS
 
    ResInsight is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
  Notice for Custom Visualization Core Library:
 ===============================================================================
    Custom Visualization Core library
-   Copyright (C) 2011-2012 Ceetron AS
+   Copyright (C) Ceetron AS, Ceetron Solutions AS
 
    This library is free software: you can redistribute it and/or modify 
    it under the terms of the GNU General Public License as published by 
@@ -36,7 +36,7 @@
 ===============================================================================
  Notice for Ensemble based Reservoir Tool:
 ===============================================================================
-    Copyright (C) 2011-2012 Statoil ASA, Norway. 
+   Copyright (C) Statoil ASA, Norway. 
 
    ERT is free software: you can redistribute it and/or modify 
    it under the terms of the GNU General Public License as published by 
@@ -274,3 +274,51 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
+
+===============================================================================
+ Notice for the Qwt libraries
+===============================================================================
+                              Qwt License
+                           Version 1.0, January 1, 2003
+
+The Qwt library and included programs are provided under the terms
+of the GNU LESSER GENERAL PUBLIC LICENSE (LGPL) with the following
+exceptions:
+
+    1. Widgets that are subclassed from Qwt widgets do not
+       constitute a derivative work.
+
+    2. Static linking of applications and widgets to the
+       Qwt library does not constitute a derivative work
+       and does not require the author to provide source
+       code for the application or widget, use the shared
+       Qwt libraries, or link their applications or
+       widgets against a user-supplied version of Qwt.
+
+       If you link the application or widget to a modified
+       version of Qwt, then the changes to Qwt must be 
+       provided under the terms of the LGPL in sections
+       1, 2, and 4.
+
+    3. You do not have to provide a copy of the Qwt license
+       with programs that are linked to the Qwt library, nor
+       do you have to identify the Qwt license in your
+       program or documentation as required by section 6
+       of the LGPL.
+
+
+       However, programs must still identify their use of Qwt.
+       The following example statement can be included in user
+       documentation to satisfy this requirement:
+
+           [program/widget] is based in part on the work of
+           the Qwt project (http://qwt.sf.net).
+
+
+===============================================================================
+ Notice for the NR libraries
+===============================================================================
+
+CRAVA is a software package for seismic inversion and conditioning of
+  geological reservoir models. CRAVA is copyrighted by the Norwegian
+  Computing Center and Statoil and licensed under GPLv3+. 

ApplicationCode/Adm/RiaBaseDefs.h

@@ -21,6 +21,6 @@
 
 // Company and Application name
 // These two together will become the registry key
-const char RI_COMPANY_NAME[]	    = "Ceetron";
-const char RI_APPLICATION_NAME[]	= "ResInsight";
+const char RI_COMPANY_NAME[]        = "Ceetron";
+const char RI_APPLICATION_NAME[]    = "ResInsight";