From 83270d09836506b7fe097e07c0633b30d67b4ecf Mon Sep 17 00:00:00 2001
From: KimLS <KLS@peqtgc.com>
Date: Fri, 23 May 2014 16:10:23 -0700
Subject: [PATCH] Merge from master stuff

---
 common/glm/glm/detail/dummy.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/glm/glm/detail/dummy.cpp b/common/glm/glm/detail/dummy.cpp
index db104e216..26160a51a 100644
--- a/common/glm/glm/detail/dummy.cpp
+++ b/common/glm/glm/detail/dummy.cpp
@@ -41,7 +41,7 @@ struct material
 	glm::vec4 diffuse; // Dcm
 	glm::vec4 specular; // Scm
 	float shininess; // Srm
-};
+};
 struct light
 {
 	glm::vec4 ambient; // Acli
@@ -58,7 +58,7 @@ struct light
 	float constantAttenuation; // K0
 	float linearAttenuation; // K1
 	float quadraticAttenuation;// K2
-};
+};
 
 // Sample 1
 #include <glm/vec3.hpp>// glm::vec3