Changeset 11054 for code/branches/cpp11_v3/src/orxonox/gamestates/GSLevelMemento.h

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/GSLevelMemento.h (modified) (1 diff)

code/branches/cpp11_v3/src/orxonox/gamestates/GSLevelMemento.h

@@ -48 +48 @@
         protected:
             /**
-             * Returns the state of this memento. Returns NULL if no state needed to persist.
+             * Returns the state of this memento. Returns nullptr if no state needed to persist.
              */
             virtual GSLevelMementoState* exportMementoState() = 0;