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-xlarge-v4.json | 216 +++++++++++++++++++----------------------------------
1 files changed, 77 insertions(+), 139 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-xlarge-v4.json b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-xlarge-v4.json
index 7b37df4..ee8fd07 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-xlarge-v4.json
+++ b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-xlarge-v4.json
@@ -1,23 +1,23 @@
[
{
- "outputFile": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-xlarge-v4\\values-xlarge-v4.xml",
+ "outputFile": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-xlarge-v4\\values-xlarge-v4.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
- "endColumn": 70,
- "endOffset": 121
+ "endColumn": 76,
+ "endOffset": 127
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-xlarge\\values-xlarge.xml",
"position": {
- "startLine": 2,
+ "startLine": 4,
"startColumn": 4,
- "startOffset": 55,
- "endColumn": 70,
- "endOffset": 121
+ "startOffset": 289,
+ "endColumn": 76,
+ "endOffset": 361
}
}
},
@@ -25,18 +25,18 @@
"to": {
"startLine": 3,
"startColumn": 4,
- "startOffset": 126,
+ "startOffset": 132,
"endColumn": 70,
- "endOffset": 192
+ "endOffset": 198
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-xlarge\\values-xlarge.xml",
"position": {
- "startLine": 3,
+ "startLine": 7,
"startColumn": 4,
- "startOffset": 126,
+ "startOffset": 601,
"endColumn": 70,
- "endOffset": 192
+ "endOffset": 667
}
}
},
@@ -44,18 +44,18 @@
"to": {
"startLine": 4,
"startColumn": 4,
- "startOffset": 197,
- "endColumn": 69,
- "endOffset": 262
+ "startOffset": 203,
+ "endColumn": 70,
+ "endOffset": 269
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-xlarge\\values-xlarge.xml",
"position": {
- "startLine": 4,
+ "startLine": 8,
"startColumn": 4,
- "startOffset": 197,
- "endColumn": 69,
- "endOffset": 262
+ "startOffset": 672,
+ "endColumn": 70,
+ "endOffset": 738
}
}
},
@@ -63,18 +63,18 @@
"to": {
"startLine": 5,
"startColumn": 4,
- "startOffset": 267,
+ "startOffset": 274,
"endColumn": 69,
- "endOffset": 332
+ "endOffset": 339
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-xlarge\\values-xlarge.xml",
"position": {
- "startLine": 5,
+ "startLine": 9,
"startColumn": 4,
- "startOffset": 267,
+ "startOffset": 743,
"endColumn": 69,
- "endOffset": 332
+ "endOffset": 808
}
}
},
@@ -82,18 +82,18 @@
"to": {
"startLine": 6,
"startColumn": 4,
- "startOffset": 337,
- "endColumn": 67,
- "endOffset": 400
+ "startOffset": 344,
+ "endColumn": 69,
+ "endOffset": 409
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-xlarge\\values-xlarge.xml",
"position": {
- "startLine": 6,
+ "startLine": 10,
"startColumn": 4,
- "startOffset": 337,
- "endColumn": 67,
- "endOffset": 400
+ "startOffset": 813,
+ "endColumn": 69,
+ "endOffset": 878
}
}
},
@@ -101,137 +101,75 @@
"to": {
"startLine": 7,
"startColumn": 4,
- "startOffset": 405,
+ "startOffset": 414,
"endColumn": 67,
- "endOffset": 468
+ "endOffset": 477
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-xlarge\\values-xlarge.xml",
"position": {
- "startLine": 7,
+ "startLine": 11,
"startColumn": 4,
- "startOffset": 405,
+ "startOffset": 883,
"endColumn": 67,
- "endOffset": 468
- }
- }
- }
- ]
- },
- {
- "outputFile": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-xlarge-v4\\values-xlarge-v4.xml",
- "map": [
- {
- "to": {
- "startLine": 2,
- "startColumn": 4,
- "startOffset": 55,
- "endColumn": 70,
- "endOffset": 121
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
- "position": {
- "startLine": 2,
- "startColumn": 4,
- "startOffset": 55,
- "endColumn": 70,
- "endOffset": 121
+ "endOffset": 946
}
}
},
{
"to": {
- "startLine": 3,
+ "startLine": 8,
"startColumn": 4,
- "startOffset": 126,
- "endColumn": 70,
- "endOffset": 192
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
- "position": {
- "startLine": 3,
- "startColumn": 4,
- "startOffset": 126,
- "endColumn": 70,
- "endOffset": 192
- }
- }
- },
- {
- "to": {
- "startLine": 4,
- "startColumn": 4,
- "startOffset": 197,
- "endColumn": 69,
- "endOffset": 262
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
- "position": {
- "startLine": 4,
- "startColumn": 4,
- "startOffset": 197,
- "endColumn": 69,
- "endOffset": 262
- }
- }
- },
- {
- "to": {
- "startLine": 5,
- "startColumn": 4,
- "startOffset": 267,
- "endColumn": 69,
- "endOffset": 332
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
- "position": {
- "startLine": 5,
- "startColumn": 4,
- "startOffset": 267,
- "endColumn": 69,
- "endOffset": 332
- }
- }
- },
- {
- "to": {
- "startLine": 6,
- "startColumn": 4,
- "startOffset": 337,
+ "startOffset": 482,
"endColumn": 67,
- "endOffset": 400
+ "endOffset": 545
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-xlarge\\values-xlarge.xml",
"position": {
- "startLine": 6,
+ "startLine": 12,
"startColumn": 4,
- "startOffset": 337,
+ "startOffset": 951,
"endColumn": 67,
- "endOffset": 400
+ "endOffset": 1014
}
}
},
{
"to": {
- "startLine": 7,
+ "startLine": 9,
"startColumn": 4,
- "startOffset": 405,
- "endColumn": 67,
- "endOffset": 468
+ "startOffset": 550,
+ "endColumn": 63,
+ "endOffset": 609
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-xlarge\\values-xlarge.xml",
"position": {
- "startLine": 7,
+ "startLine": 13,
"startColumn": 4,
- "startOffset": 405,
- "endColumn": 67,
- "endOffset": 468
+ "startOffset": 1019,
+ "endColumn": 63,
+ "endOffset": 1078
+ }
+ }
+ },
+ {
+ "to": {
+ "startLine": 10,
+ "startColumn": 4,
+ "startOffset": 614,
+ "endColumn": 54,
+ "endOffset": 664
+ },
+ "from": {
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-xlarge\\values-xlarge.xml",
+ "position": {
+ "startLine": 14,
+ "startColumn": 4,
+ "startOffset": 1083,
+ "endColumn": 54,
+ "endOffset": 1133
}
}
}
--
Gitblit v1.8.0