From 70c47928a6a750562f3b48da4c3fc141a7d77196 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 02 八月 2017 10:06:13 +0800
Subject: [PATCH] panshen add capnproto lib
---
VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v18.json | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v18.json b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v18.json
index ac91094..4ba2beb 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v18.json
+++ b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v18.json
@@ -1,6 +1,6 @@
[
{
- "outputFile": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v18\\values-v18.xml",
+ "outputFile": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v18\\values-v18.xml",
"map": [
{
"to": {
@@ -11,37 +11,13 @@
"endOffset": 99
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v18\\values-v18.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v18\\values-v18.xml",
"position": {
- "startLine": 2,
+ "startLine": 4,
"startColumn": 4,
- "startOffset": 55,
+ "startOffset": 287,
"endColumn": 48,
- "endOffset": 99
- }
- }
- }
- ]
- },
- {
- "outputFile": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v18\\values-v18.xml",
- "map": [
- {
- "to": {
- "startLine": 2,
- "startColumn": 4,
- "startOffset": 55,
- "endColumn": 48,
- "endOffset": 99
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v18\\values-v18.xml",
- "position": {
- "startLine": 2,
- "startColumn": 4,
- "startOffset": 55,
- "endColumn": 48,
- "endOffset": 99
+ "endOffset": 331
}
}
}
--
Gitblit v1.8.0