]> OCCT Git - occt-copy.git/commit
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)
commit2d744877147695c032c95e7ed5edaf47ef2547d0
tree7a7212d94b755259305d35d172ee54513f020a86
parent28788431c6e606f33ca8a9ae1a56e3aee1aae2b6
parent52e6db9d8a98b5dee78e4b729cb1ec606aa1bd46
Merge branch 'master' into CR24238_DLN

Conflicts:
src/PLib/PLib.cxx
src/BSplSLib/BSplSLib.cxx
src/NCollection/FILES