- Timestamp:
- May 22, 2014, 2:49:16 PM (10 years ago)
- Location:
- code/branches/presentationFS14
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/orxonox/worldentities/StaticEntity.cc (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentationFS14
- Property svn:mergeinfo changed
/code/branches/modularships (added) merged: 9994-9997,10001-10003,10007,10011,10019,10023,10029,10033,10036,10052-10055,10058,10067-10068,10071
- Property svn:mergeinfo changed
-
code/branches/presentationFS14/src/orxonox/worldentities/StaticEntity.cc
r9667 r10073 34 34 #include "util/OrxAssert.h" 35 35 #include "core/CoreIncludes.h" 36 #include "worldentities/BigExplosion.h" 36 37 37 38 namespace orxonox … … 115 116 worldTrans.setRotation(btQuaternion(node_->getOrientation().x, node_->getOrientation().y, node_->getOrientation().z, node_->getOrientation().w)); 116 117 } 118 117 119 }
Note: See TracChangeset
for help on using the changeset viewer.
