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