- Timestamp:
- Aug 25, 2013, 9:08:42 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core6 merged: 9552-9554,9556-9574,9577-9579,9585-9593,9596-9612,9626-9662
- Property svn:mergeinfo changed
-
code/trunk/src/modules/objects/triggers/MultiTriggerContainer.h
r7601 r9667 58 58 59 59 public: 60 MultiTriggerContainer( BaseObject* creator); //!< Default constructor. Registers the object and creates an empty container.61 MultiTriggerContainer( BaseObject* creator, MultiTrigger* originator, BaseObject* data); //!< Constructor. Registers the object and sets the input values.60 MultiTriggerContainer(Context* context); //!< Default constructor. Registers the object and creates an empty container. 61 MultiTriggerContainer(Context* context, MultiTrigger* originator, BaseObject* data); //!< Constructor. Registers the object and sets the input values. 62 62 virtual ~MultiTriggerContainer(); //!< Destructor. 63 63
Note: See TracChangeset
for help on using the changeset viewer.