diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
| commit | e0eb815b67734abd09ff41e2271630d4b2a6d760 (patch) | |
| tree | 0df971c34f98d2a1dfd0921524a17d561a4a6536 /lib/common/StreamableMemBlock.h | |
| parent | 676c9e1c9d4ac8eb8a440d7f11c4ac44f98f4a6a (diff) | |
| parent | e19a5db232e1ef90e9a02159d2fbd9707ffe4373 (diff) | |
merge upstream version 0.12
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 // // -------------------------------------------------------------------------- |