external/glm/Wshadow-unix.patch | 4 ++--
external/glm/Wshadow-windows.patch | 4 ++--
external/mysqlcppconn/patches/cmake.patch | 2 +-
instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 67d7ba55a007cc11bc291a6e97b1fdcc2cc1bad1
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Dec 9 16:44:18 2014 +0100
Revert "Fix common typos. No automatic tools. Handmadeâ¦"
This reverts commit 759c4d18d57b06dcc26fb82759599a29c61ef853, every part of
it
is wrong.
diff --git a/external/glm/Wshadow-unix.patch b/external/glm/Wshadow-unix.patch
index 47a34a7..be4af10 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_);
//////////////////////////////////////
- // 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 <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 fa8c284..c6c9c65 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_);
//////////////////////////////////////
- // Conversion scalar constructors
+ // Convertion 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_);
//////////////////////////////////////
- // Conversion vector constructors
+ // Convertion vector constructors
@@ -121,19 +121,19 @@
GLM_FUNC_DECL tvec1<T> & operator= (tvec1<U> const & v);
diff --git a/external/mysqlcppconn/patches/cmake.patch
b/external/mysqlcppconn/patches/cmake.patch
index a856c21..79fe064 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 definition, but
CMake manual says I can!! ;)
+- ADD_DEFINITIONS(-library=stlport4) # Not a macro defintion, 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")
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
index 4f3830d..d937499 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
@@ -111,7 +111,7 @@ CreateFolder Component_ N
Component 1 Identifier Foreign key into the Compone
CreateFolder Directory_ N Directory 1
Identifier Primary key, could be foreign key into the Directory
table.
CustomAction Action N Identifier
Primary key, name of action, normally appears in sequence table unless
private use.
CustomAction Source Y CustomSource
The table reference of the source of the code.
-CustomAction Target Y Formatted
Execution parameter, depends on the type of custom action
+CustomAction Target Y Formatted
Excecution parameter, depends on the type of custom action
CustomAction Type N 1 32767
The numeric custom action type, consisting of source location, code type,
entry, option flags.
Dialog Attributes Y 0 2147483647
A 32-bit word that specifies the attribute flags to be applied to this
dialog.
Dialog Control_Cancel Y Control 2 Identifier
Defines the cancel control. Hitting escape or clicking on the close
icon on the dialog is equivalent to pushing this button.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
