From 03d45e330cfad4766397b7539e63ee41ac0db1a0 Mon Sep 17 00:00:00 2001 From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674> Date: 星期四, 27 七月 2017 20:46:01 +0800 Subject: [PATCH] Failed commit: Default --- VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugShaders/merger.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 11fe7d3..49239b8 100644 --- a/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8"?> -<merger version="3"><dataSet config="main"><source path="/Users/zhangbo/home/work/DemoForBsk/app/src/main/shaders"/></dataSet><dataSet config="debug"><source path="/Users/zhangbo/home/work/DemoForBsk/app/src/debug/shaders"/></dataSet></merger> \ No newline at end of file +<merger version="3"><dataSet config="main"><source path="F:\workspace2\VisitFace\DemoForBsk\app\src\main\shaders"/></dataSet><dataSet config="debug"><source path="F:\workspace2\VisitFace\DemoForBsk\app\src\debug\shaders"/></dataSet></merger> \ No newline at end of file -- Gitblit v1.8.0