Fixed merge

This commit is contained in:
Christophe Riccio
2011-04-09 11:04:08 +01:00
2 changed files with 6 additions and 2 deletions

View File

@@ -4,12 +4,12 @@
// Created : 2010-09-16
// Updated : 2010-09-16
// Licence : This source is under MIT licence
// File : test/gtc/matrix_transform.cpp
// File : test/gtc/type_ptr.cpp
///////////////////////////////////////////////////////////////////////////////////////////////////
#define GLM_MESSAGES
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
bool test_make_pointer()
{