Merge branch 'V7_dev' into V8_0_0_BR

author vsr <vsr@opencascade.com>

Tue, 2 Feb 2016 16:03:10 +0000 (19:03 +0300)

committer vsr <vsr@opencascade.com>

Tue, 2 Feb 2016 16:03:10 +0000 (19:03 +0300)
author vsr <vsr@opencascade.com>
Tue, 2 Feb 2016 16:03:10 +0000 (19:03 +0300)
committer vsr <vsr@opencascade.com>
Tue, 2 Feb 2016 16:03:10 +0000 (19:03 +0300)
diff --cc src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
Simple merge
author	vsr <vsr@opencascade.com>
	Tue, 2 Feb 2016 16:03:10 +0000 (19:03 +0300)
committer	vsr <vsr@opencascade.com>
	Tue, 2 Feb 2016 16:03:10 +0000 (19:03 +0300)