diff options
| author | sapier <sapier at gmx dot net> | 2012-02-04 12:41:25 +0100 |
|---|---|---|
| committer | sapier <sapier at gmx dot net> | 2012-02-04 12:41:25 +0100 |
| commit | 77df09540c4d7eadef760779e123af88a48aafaa (patch) | |
| tree | febf1009328d30c31a14a1a1ca1600e99b4c3e6b /src/irrlichttypes.h | |
| parent | 3454e6779337d8523ae76c7fa16eb8c565aa2381 (diff) | |
| parent | a1eb2836c0764829ebad1462432bb3c5f32750df (diff) | |
| download | minetest-77df09540c4d7eadef760779e123af88a48aafaa.tar.xz | |
Merge remote branch 'upstream/master' into sapier_experimental
Conflicts:
src/scriptapi.cpp
Diffstat (limited to 'src/irrlichttypes.h')
| -rw-r--r-- | src/irrlichttypes.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/irrlichttypes.h b/src/irrlichttypes.h index bc17694fc..67c96a653 100644 --- a/src/irrlichttypes.h +++ b/src/irrlichttypes.h @@ -39,6 +39,8 @@ typedef core::vector2d<s32> v2s32; typedef core::vector2d<u32> v2u32; typedef core::vector2d<f32> v2f32; +typedef core::aabbox3d<f32> aabb3f; + #ifdef _MSC_VER // Windows typedef unsigned long long u64; |