diff options
author | Sadie Powell <sadie@witchery.services> | 2021-08-01 18:53:24 +0100 |
---|---|---|
committer | Sadie Powell <sadie@witchery.services> | 2021-08-01 18:53:24 +0100 |
commit | 561b205c4a3a125c12a7926ef18fa1eb822c387c (patch) | |
tree | c763ddefe765e23ec0ff189e24d55f634b52b954 /include/serialize.h | |
parent | 376053e0acae2a37a8f5c77c8de25ebf8a8395a9 (diff) | |
parent | 91321bdf682eb5b512373bb56c722f943cbc8183 (diff) |
Merge branch '2.0' into 2.1.
Diffstat (limited to 'include/serialize.h')
-rw-r--r-- | include/serialize.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/serialize.h b/include/serialize.h index 41ab41d9c..406b9698f 100644 --- a/include/serialize.h +++ b/include/serialize.h @@ -46,7 +46,7 @@ namespace Serialize template<typename T> class Reference; } -/** A serialziable object. Serializable objects can be serialized into +/** A serializable object. Serializable objects can be serialized into * abstract data types (Serialize::Data), and then reconstructed or * updated later at any time. */ @@ -105,7 +105,7 @@ class CoreExport Serializable : public virtual Base }; /* A serializable type. There should be one of these classes for each type - * of class that inherits from Serialiable. Used for unserializing objects + * of class that inherits from Serializable. Used for unserializing objects * of this type, as it requires a function pointer to a static member function. */ class CoreExport Serialize::Type : public Base @@ -123,7 +123,7 @@ class CoreExport Serialize::Type : public Base */ Module *owner; - /* The timesatmp for this type. All objects of this type are as up to date as + /* The timestamp for this type. All objects of this type are as up to date as * this timestamp. if curtime == timestamp then we have the most up to date * version of every object of this type. */ |