From 25bafe4739ae921fb72fb3d6c8e037611eba1686 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 七月 2017 20:53:10 +0800
Subject: [PATCH] Failed commit: Default

---
 VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugShaders/merger.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
new file mode 100644
index 0000000..49239b8
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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