comparison .hgignore @ 554:841ab71cd91f dev

merge
author Alain Mazy <alain@mazy.be>
date Wed, 03 Apr 2019 17:39:17 +0200
parents 1d9deb4ee84c
children 529c9617654b b7fd0471281c
comparison
equal deleted inserted replaced
553:92305ee35b1c 554:841ab71cd91f
1 CMakeLists.txt.user 1 CMakeLists.txt.user
2 Platforms/Generic/ThirdPartyDownloads/ 2 Platforms/Generic/ThirdPartyDownloads/
3 Applications/build-* 3 Applications/build-*
4 Applications/Qt/archive/ 4 Applications/Qt/archive/
5 Applications/Samples/ThirdPartyDownloads/ 5 Applications/Samples/ThirdPartyDownloads/
6 Applications/Samples/rt-viewer-demo/build-sdl-msvc15/
7 Applications/Samples/rt-viewer-demo/build-tsc-output/
8 Applications/Samples/rt-viewer-demo/build-wasm/
9 Applications/Samples/rt-viewer-demo/build-web/
10 Applications/Samples/rt-viewer-demo/ThirdPartyDownloads/
6 Applications/Samples/build-wasm/ 11 Applications/Samples/build-wasm/
7 Applications/Samples/build-web/ 12 Applications/Samples/build-web/
8 Applications/Samples/node_modules/ 13 Applications/Samples/node_modules/
9 Resources/CommandTool/protoc-tests/node_modules/ 14 Resources/CommandTool/protoc-tests/node_modules/
10 Resources/CommandTool/protoc-tests/generated_js/ 15 Resources/CommandTool/protoc-tests/generated_js/
18 Resources/CodeGeneration/testCppHandler/build_msbuild/ 23 Resources/CodeGeneration/testCppHandler/build_msbuild/
19 syntax: glob 24 syntax: glob
20 Resources/CodeGeneration/testWasmIntegrated/build-wasm/ 25 Resources/CodeGeneration/testWasmIntegrated/build-wasm/
21 Resources/CodeGeneration/testWasmIntegrated/build-tsc/ 26 Resources/CodeGeneration/testWasmIntegrated/build-tsc/
22 Resources/CodeGeneration/testWasmIntegrated/build-final/ 27 Resources/CodeGeneration/testWasmIntegrated/build-final/
28