Fix merge conflicts.
parent
9ae79fb1e3
commit
52a7772611
|
@ -540,6 +540,10 @@ struct aiBuffer {
|
||||||
#endif //! __cplusplus
|
#endif //! __cplusplus
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif //! __cplusplus
|
||||||
|
|
||||||
// Include implementation files
|
// Include implementation files
|
||||||
#include "vector2.inl"
|
#include "vector2.inl"
|
||||||
#include "vector3.inl"
|
#include "vector3.inl"
|
||||||
|
|
Loading…
Reference in New Issue