]> OCCT Git - occt-copy.git/commitdiff
projects / occt-copy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2878843 52e6db9)
Merge branch 'master' into CR24238_DLN CR24238_DLN
authordln <dmitry.lisin@opencascade.com>
Wed, 4 Dec 2013 04:35:37 +0000 (08:35 +0400)
committerdln <dmitry.lisin@opencascade.com>
Wed, 4 Dec 2013 04:35:37 +0000 (08:35 +0400)
Conflicts:
src/PLib/PLib.cxx

1  2 
src/BSplSLib/BSplSLib.cxx patch | diff1 | diff2 | blob | history
src/NCollection/FILES patch | diff1 | diff2 | blob | history

diff --cc src/BSplSLib/BSplSLib.cxx
Simple merge
diff --cc src/NCollection/FILES
Simple merge
Test copy of Open CASCADE Technology repository