Correction of merge results
authorbugmaster <bugmaster@opencascade.com>
Wed, 7 Mar 2012 09:31:49 +0000 (13:31 +0400)
committerbugmaster <bugmaster@opencascade.com>
Wed, 7 Mar 2012 09:31:49 +0000 (13:31 +0400)
commite2e80ff797c1141f5bc902d442727871090c173c
treecca176d7f919ef555278850a2bf5e49364156093
parent65c62757a4e0ae1a2b9da144e404b057b01e1e9e
Correction of merge results
src/NCollection/NCollection_DefineAlloc.hxx
src/Standard/Standard_DefineAlloc.hxx