diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-06 15:06:28 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-06 15:06:28 -0800 |
| commit | 7347305e8459fcc78553a9f88196e0d93eb0a8fe (patch) | |
| tree | ac9eee9ff267c6a71a83249bed7a94f02b00d9a5 /ports/devil/0001_fix-encoding.patch | |
| parent | ed9357a5aafea7192932b5874264bd103fc61255 (diff) | |
| parent | 63c1b2628e958f8e02356411f032941c0c2f3bbb (diff) | |
| download | vcpkg-7347305e8459fcc78553a9f88196e0d93eb0a8fe.tar.gz vcpkg-7347305e8459fcc78553a9f88196e0d93eb0a8fe.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/3425
Diffstat (limited to 'ports/devil/0001_fix-encoding.patch')
| -rw-r--r-- | ports/devil/0001_fix-encoding.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ports/devil/0001_fix-encoding.patch b/ports/devil/0001_fix-encoding.patch index 395171e71..59d826d25 100644 --- a/ports/devil/0001_fix-encoding.patch +++ b/ports/devil/0001_fix-encoding.patch @@ -1,7 +1,7 @@ -diff --git a/src-ILU/include/ilu_error/ilu_err-french.h b/src-ILU/include/ilu_error/ilu_err-french.h +diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-french.h b/DevIL/src-ILU/include/ilu_error/ilu_err-french.h index d3b280d..445440e 100644 ---- a/src-ILU/include/ilu_error/ilu_err-french.h -+++ b/src-ILU/include/ilu_error/ilu_err-french.h +--- a/DevIL/src-ILU/include/ilu_error/ilu_err-french.h ++++ b/DevIL/src-ILU/include/ilu_error/ilu_err-french.h @@ -17,19 +17,19 @@ #include "ilu_internal.h" @@ -41,10 +41,10 @@ index d3b280d..445440e 100644 IL_TEXT("jpeg : erreur dans la librairie"), IL_TEXT("png : erreur dans la librairie"), IL_TEXT("tiff : erreur dans la librairie"), -diff --git a/src-ILU/include/ilu_error/ilu_err-german.h b/src-ILU/include/ilu_error/ilu_err-german.h +diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-german.h b/DevIL/src-ILU/include/ilu_error/ilu_err-german.h index bf3f05c..acdbe8a 100644 ---- a/src-ILU/include/ilu_error/ilu_err-german.h -+++ b/src-ILU/include/ilu_error/ilu_err-german.h +--- a/DevIL/src-ILU/include/ilu_error/ilu_err-german.h ++++ b/DevIL/src-ILU/include/ilu_error/ilu_err-german.h @@ -6,7 +6,7 @@ // // Filename: src-ILU/include/ilu_error/ilu_err_German.h @@ -91,10 +91,10 @@ index bf3f05c..acdbe8a 100644 IL_TEXT("Fehler beim Lesen der Datei") }; -diff --git a/src-ILU/include/ilu_error/ilu_err-italian.h b/src-ILU/include/ilu_error/ilu_err-italian.h +diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-italian.h b/DevIL/src-ILU/include/ilu_error/ilu_err-italian.h index 09d7bd1..d34b23f 100644 ---- a/src-ILU/include/ilu_error/ilu_err-italian.h -+++ b/src-ILU/include/ilu_error/ilu_err-italian.h +--- a/DevIL/src-ILU/include/ilu_error/ilu_err-italian.h ++++ b/DevIL/src-ILU/include/ilu_error/ilu_err-italian.h @@ -22,13 +22,13 @@ ILconst_string iluErrorStringsItalian[IL_FILE_READ_ERROR - IL_INVALID_ENUM + 1] IL_TEXT("configuri non sostenne"), IL_TEXT("erreur interne"), @@ -112,10 +112,10 @@ index 09d7bd1..d34b23f 100644 IL_TEXT("equivalente fuori-configuri"), IL_TEXT("inondi di batteria"), IL_TEXT("insufficienza di batteria"), -diff --git a/src-ILU/include/ilu_error/ilu_err-spanish.h b/src-ILU/include/ilu_error/ilu_err-spanish.h +diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-spanish.h b/DevIL/src-ILU/include/ilu_error/ilu_err-spanish.h index 77b5a24..0945fdf 100644 ---- a/src-ILU/include/ilu_error/ilu_err-spanish.h -+++ b/src-ILU/include/ilu_error/ilu_err-spanish.h +--- a/DevIL/src-ILU/include/ilu_error/ilu_err-spanish.h ++++ b/DevIL/src-ILU/include/ilu_error/ilu_err-spanish.h @@ -6,7 +6,7 @@ // // Filename: src-ILU/include/ilu_error/ilu_err-spanish.h |