diff options
Diffstat (limited to 'lib/common/StreamableMemBlock.cpp')
| -rw-r--r-- | lib/common/StreamableMemBlock.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/common/StreamableMemBlock.cpp b/lib/common/StreamableMemBlock.cpp index cf431022..ce2e1f98 100644 --- a/lib/common/StreamableMemBlock.cpp +++ b/lib/common/StreamableMemBlock.cpp @@ -3,6 +3,10 @@ // File // Name: StreamableMemBlock.cpp // Purpose: Memory blocks which can be loaded and saved from streams +<<<<<<< HEAD +======= +// with a header indicating the size of the block. +>>>>>>> 0.12 // Created: 2003/09/05 // // -------------------------------------------------------------------------- |