Salome HOME
projects
/
modules
/
shaper.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d5297c3
12bb2a3
)
Merge branch 'SALOME-8.2.0_porting'
author
vsv
<vitaly.smetannikov@opencascade.com>
Thu, 22 Dec 2016 13:09:03 +0000
(16:09 +0300)
committer
vsv
<vitaly.smetannikov@opencascade.com>
Thu, 22 Dec 2016 13:09:03 +0000
(16:09 +0300)
Conflicts:
src/SketchPlugin/Test/TestArcBehavior.py
src/XGUI/CMakeLists.txt
1
2
src/CollectionPlugin/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
src/Model/Model_AttributeSelectionList.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/SHAPERGUI/SHAPERGUI.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/XGUI/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/CollectionPlugin/CMakeLists.txt
Simple merge
diff --cc
src/Model/Model_AttributeSelectionList.cpp
Simple merge
diff --cc
src/SHAPERGUI/SHAPERGUI.cpp
Simple merge
diff --cc
src/XGUI/CMakeLists.txt
Simple merge