Changeset 10733 for code/branches/cpp11_v2/src/modules/jump/JumpSpring.h
- Timestamp:
- Oct 31, 2015, 6:11:53 PM (10 years ago)
- Location:
- code/branches/cpp11_v2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2
- Property svn:mergeinfo changed
/code/branches/cpp11 (added) merged: 10439-10441,10443,10545
- Property svn:mergeinfo changed
-
code/branches/cpp11_v2/src/modules/jump/JumpSpring.h
r10262 r10733 30 30 #define _JumpSpring_H__ 31 31 32 #include "jump/JumpPrereqs.h" 33 34 #include "util/Math.h" 35 36 #include "worldentities/MovableEntity.h" 37 32 #include "JumpPrereqs.h" 33 #include "JumpItem.h" 38 34 39 35 namespace orxonox
Note: See TracChangeset
for help on using the changeset viewer.