← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.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
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* 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:
extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
22
22
*/
23
23
 
24
24
 
25
 
#ifndef TRIANGLE_SHAPE_EX_H
26
 
#define TRIANGLE_SHAPE_EX_H
 
25
#ifndef GIMPACT_TRIANGLE_SHAPE_EX_H
 
26
#define GIMPACT_TRIANGLE_SHAPE_EX_H
27
27
 
28
28
#include "BulletCollision/CollisionShapes/btCollisionShape.h"
29
29
#include "BulletCollision/CollisionShapes/btTriangleShape.h"
177
177
};
178
178
 
179
179
 
180
 
#endif //TRIANGLE_MESH_SHAPE_H
 
180
#endif //GIMPACT_TRIANGLE_MESH_SHAPE_H