From: asl <asl@opencascade.com>
Date: Mon, 5 Dec 2016 07:59:08 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/V7_8_BR' into hydro/imps_2015
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fhydro%2Fimps_2015;p=modules%2Fgui.git

Merge remote-tracking branch 'origin/V7_8_BR' into hydro/imps_2015

Conflicts:
	CMakeLists.txt
	src/SalomeApp/salome_pluginsmanager.py
---

e1bbd3529c5ed6c65adfd80571a411e902dc13a7
diff --cc CMakeLists.txt
index 3b4f3ceca,67d784138..c10aa25c9
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -30,8 -30,8 +30,8 @@@ CMAKE_POLICY(SET CMP0003 NEW
  STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
- SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
+ SET(${PROJECT_NAME_UC}_MINOR_VERSION 8)
 -SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 +SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
  SET(${PROJECT_NAME_UC}_VERSION
    ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
  SET(${PROJECT_NAME_UC}_VERSION_DEV 0)