~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
33
33
 
34
34
 
35
35
 
36
 
#ifndef CONETWISTCONSTRAINT_H
37
 
#define CONETWISTCONSTRAINT_H
 
36
#ifndef BT_CONETWISTCONSTRAINT_H
 
37
#define BT_CONETWISTCONSTRAINT_H
38
38
 
39
39
#include "LinearMath/btVector3.h"
40
40
#include "btJacobianEntry.h"
343
343
}
344
344
 
345
345
 
346
 
#endif //CONETWISTCONSTRAINT_H
 
346
#endif //BT_CONETWISTCONSTRAINT_H