From 67d7ba55a007cc11bc291a6e97b1fdcc2cc1bad1 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 9 Dec 2014 16:44:18 +0100 Subject: Revert "Fix common typos. No automatic tools. Handmade…" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 759c4d18d57b06dcc26fb82759599a29c61ef853, every part of it is wrong. --- external/glm/Wshadow-unix.patch | 4 ++-- external/glm/Wshadow-windows.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'external/glm') diff --git a/external/glm/Wshadow-unix.patch b/external/glm/Wshadow-unix.patch index 47a34a77b086..be4af10f9896 100644 --- a/external/glm/Wshadow-unix.patch +++ b/external/glm/Wshadow-unix.patch @@ -52,9 +52,9 @@ diff -ur glm.org/glm/core/type_vec1.hpp glm/glm/core/type_vec1.hpp + GLM_FUNC_DECL tvec1(tref1 const & r_); ////////////////////////////////////// - // Conversion scalar constructors + // Convertion scalar constructors - //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) + //! Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL explicit tvec1(U const & s); + GLM_FUNC_DECL explicit tvec1(U const & s_); diff --git a/external/glm/Wshadow-windows.patch b/external/glm/Wshadow-windows.patch index fa8c28446c44..c6c9c6585782 100644 --- a/external/glm/Wshadow-windows.patch +++ b/external/glm/Wshadow-windows.patch @@ -52,7 +52,7 @@ diff -ur glm.org/glm/core/type_vec1.hpp glm/glm/core/type_vec1.hpp + GLM_FUNC_DECL tvec1(tref1 const & r_); ////////////////////////////////////// - // Conversion scalar constructors + // Convertion scalar constructors //! Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template @@ -60,7 +60,7 @@ diff -ur glm.org/glm/core/type_vec1.hpp glm/glm/core/type_vec1.hpp + GLM_FUNC_DECL explicit tvec1(U const & s_); ////////////////////////////////////// - // Conversion vector constructors + // Convertion vector constructors @@ -121,19 +121,19 @@ GLM_FUNC_DECL tvec1 & operator= (tvec1 const & v); -- cgit