summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorAndrea Gelmini <andrea.gelmini@gelma.net>2014-11-10 15:05:25 +0100
committerNoel Grandin <noelgrandin@gmail.com>2014-11-12 11:04:11 +0000
commitda40cac540e7d735edbe9069b3c8ec6af4530208 (patch)
treef2abda7281129e13f588c77b18780a7090c8405f /external
parentbb437029c1e5331bcc3f8fb2fc87837142a52f33 (diff)
Fix common typos. No automatic tools. Handmade…
Change-Id: I1ab4e23b0539f8d39974787f226e57a21f96e959 Reviewed-on: https://gerrit.libreoffice.org/12164 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'external')
-rw-r--r--external/glm/Wshadow-unix.patch4
-rw-r--r--external/glm/Wshadow-windows.patch4
-rw-r--r--external/languagetool/README4
-rw-r--r--external/libexttextcat/README2
-rw-r--r--external/mysqlcppconn/patches/cmake.patch2
5 files changed, 8 insertions, 8 deletions
diff --git a/external/glm/Wshadow-unix.patch b/external/glm/Wshadow-unix.patch
index be4af10f9896..47a34a77b086 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<T> const & r_);
//////////////////////////////////////
- // Convertion scalar constructors
+ // Conversion scalar constructors
- //! Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
+ //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
template <typename U>
- 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 c6c9c6585782..fa8c28446c44 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<T> const & r_);
//////////////////////////////////////
- // Convertion scalar constructors
+ // Conversion scalar constructors
//! Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
template <typename U>
@@ -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_);
//////////////////////////////////////
- // Convertion vector constructors
+ // Conversion vector constructors
@@ -121,19 +121,19 @@
GLM_FUNC_DECL tvec1<T> & operator= (tvec1<U> const & v);
diff --git a/external/languagetool/README b/external/languagetool/README
index 72d70412b641..1a33382f7c3a 100644
--- a/external/languagetool/README
+++ b/external/languagetool/README
@@ -1,5 +1,5 @@
Style and grammar checker for various languages written in Java, from [http://www.languagetool.org/]
Shipping this is a compile-time option for LibreOffice, but our
-downloadable builds use the light-weight lightproof grammer checker
-instead to avoid the Java bootstrapping performance issues. \ No newline at end of file
+downloadable builds use the light-weight lightproof grammar checker
+instead to avoid the Java bootstrapping performance issues.
diff --git a/external/libexttextcat/README b/external/libexttextcat/README
index c35b88f013bc..5aceab363a5f 100644
--- a/external/libexttextcat/README
+++ b/external/libexttextcat/README
@@ -1,6 +1,6 @@
N-Gram-Based Text Categorization library
This guesses the language that input text is written in. Fundamentally
-an adaption of of wiseguys libtextcat extended to be UTF-8 aware.
+an adaption of wiseguys libtextcat extended to be UTF-8 aware.
It is hosted at: [http://cgit.freedesktop.org/libreoffice/libexttextcat/]
diff --git a/external/mysqlcppconn/patches/cmake.patch b/external/mysqlcppconn/patches/cmake.patch
index 79fe064fc8e6..a856c213076a 100644
--- a/external/mysqlcppconn/patches/cmake.patch
+++ b/external/mysqlcppconn/patches/cmake.patch
@@ -127,7 +127,7 @@ diff --recursive -u UnpackedTarball/mysqlcppconn.origin/CMakeLists.txt UnpackedT
- ENDIF(STLPORT_INCLUDE_DIR)
-
- # We want to set the inclusion of the library globally
-- ADD_DEFINITIONS(-library=stlport4) # Not a macro defintion, but CMake manual says I can!! ;)
+- ADD_DEFINITIONS(-library=stlport4) # Not a macro definition, but CMake manual says I can!! ;)
- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -library=stlport4")
- SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -library=stlport4")
- SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -library=stlport4")