Merge V8_3_BR branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc9c953d976180070d26be9526879ea30785c0af..1fe7e3232b8883dff0e6e007255fa59fa845d1aa 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})

diff --git a/doc/dev/sphinx/_static/medcalc.css b/doc/dev/sphinx/_static/medcalc.css
index 1d0a878f4ec40179497875b8d5270d7355dc75b3..712066dd5befcb6c451c756bef31c04b871a18d1 100644 (file)
--- a/doc/dev/sphinx/_static/medcalc.css
+++ b/doc/dev/sphinx/_static/medcalc.css
@@ -1,3 +1,4 @@
+@import url("default.css");
 @import url("classic.css");
 
 body {

diff --git a/doc/dev/sphinx/conf.py.in b/doc/dev/sphinx/conf.py.in
index 3e032751374187c38db687d8bbc155b0bbd3d432..575f204f8f0087cec6de46dcd546514ed12fd753 100644 (file)
--- a/doc/dev/sphinx/conf.py.in
+++ b/doc/dev/sphinx/conf.py.in
@@ -47,7 +47,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'MED, Manipulation de champs dans SALOME'
-copyright = '2010-2016 CEA/DEN, EDF R&D, OPEN CASCADE, G. Boulant, A. Geay'
+copyright = '2010-2017 CEA/DEN, EDF R&D, OPEN CASCADE, G. Boulant, A. Geay'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the