]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
projects / modules / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9901984 107bcfc)
fix merge conflicts
authorCédric Aguerre <cedric.aguerre@edf.fr>
Wed, 4 Mar 2015 13:16:56 +0000 (14:16 +0100)
committerCédric Aguerre <cedric.aguerre@edf.fr>
Wed, 4 Mar 2015 13:16:56 +0000 (14:16 +0100)
1  2 
bin/salomeContext.py patch | diff1 | diff2 | blob | history

diff --cc bin/salomeContext.py
Simple merge
SALOME Kernel module

Copyright © 2005 - 2024 Open CASCADE.
All rights reserved.
Legal Information