From 2e9115bf0d7083f50944cbcdd22bb3dd9072b6cc Mon Sep 17 00:00:00 2001
From: jiaojizu <jiaojizu@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 09 三月 2017 09:30:42 +0800
Subject: [PATCH] 

---
 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..9cf191b 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="D:\work\DemoForBsk\app\src\main\shaders"/></dataSet><dataSet config="debug"><source path="D:\work\DemoForBsk\app\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file

--
Gitblit v1.8.0