Changeset 6419 for code/branches/pickup3/src/orxonox/pickup/ModifierType.h
- Timestamp:
- Dec 25, 2009, 11:07:09 PM (14 years ago)
- Location:
- code/branches/pickup3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pickup3
- Property svn:mergeinfo changed
/code/branches/pickup2 (added) merged: 5942,5947,5953,6405
- Property svn:mergeinfo changed
-
code/branches/pickup3/src/orxonox/pickup/ModifierType.h
r5781 r6419 39 39 namespace orxonox 40 40 { 41 //TODO: Merge with ModifierPickup. 41 42 namespace ModifierType 42 43 {
Note: See TracChangeset
for help on using the changeset viewer.