diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:20:34 +0000 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:20:34 +0000 |
| commit | a42bed2e9a78715889240ff900e2391bef923285 (patch) | |
| tree | 202c502b7e964384fb7f0639b756353374b0c045 /intl/icu/source/tools/genbrk | |
| parent | 9a2224a97c7d258fc1f0e5fad30706987880ce22 (diff) | |
| parent | 276f6583e00edf2a217a3092471ca2aa3aab5a09 (diff) | |
| download | UXP-a42bed2e9a78715889240ff900e2391bef923285.tar UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.gz UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.lz UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.xz UXP-a42bed2e9a78715889240ff900e2391bef923285.zip | |
Merge branch 'master' into remove-unboxed
# Conflicts:
# js/src/jit/BaselineIC.cpp
# js/src/jsarray.cpp
Diffstat (limited to 'intl/icu/source/tools/genbrk')
| -rw-r--r-- | intl/icu/source/tools/genbrk/genbrk.vcxproj | 2 | ||||
| -rw-r--r-- | intl/icu/source/tools/genbrk/genbrk.vcxproj.filters | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intl/icu/source/tools/genbrk/genbrk.vcxproj b/intl/icu/source/tools/genbrk/genbrk.vcxproj index fa47d5552..159f19583 100644 --- a/intl/icu/source/tools/genbrk/genbrk.vcxproj +++ b/intl/icu/source/tools/genbrk/genbrk.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
diff --git a/intl/icu/source/tools/genbrk/genbrk.vcxproj.filters b/intl/icu/source/tools/genbrk/genbrk.vcxproj.filters index cfa644e39..55c79540c 100644 --- a/intl/icu/source/tools/genbrk/genbrk.vcxproj.filters +++ b/intl/icu/source/tools/genbrk/genbrk.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> |