Salome HOME
projects
/
modules
/
gui.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5cbe4dc
8e64bd8
)
Merge branch 'V9_2_BR'
author
vsr
<vsr@opencascade.com>
Mon, 10 Dec 2018 14:23:54 +0000
(17:23 +0300)
committer
vsr
<vsr@opencascade.com>
Mon, 10 Dec 2018 14:25:19 +0000
(17:25 +0300)
1
2
CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
patch
|
diff1
|
diff2
|
blob
|
history
src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
patch
|
diff1
|
diff2
|
blob
|
history
src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CMakeLists.txt
index ee461e6600dfdeca2c9adbb89138c951acd64ea4,6dd2c7891cdf25f06f0574b0047d83bba501a9b2..3842e1e42ffccc525e88e0d90d97983745768675
---
1
/
CMakeLists.txt
---
2
/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@@
-37,7
-37,7
+37,7
@@@
SET(${PROJECT_NAME_UC}_MINOR_VERSION 2
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})
--SET(${PROJECT_NAME_UC}_VERSION_DEV
0
)
++SET(${PROJECT_NAME_UC}_VERSION_DEV
1
)
# Common CMake macros
# ===================
diff --cc
src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
Simple merge
diff --cc
src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
Simple merge
diff --cc
src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
Simple merge