From d81a5dd7415707137147ab6490162322df6f6363 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 28 七月 2017 13:49:09 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-land.json | 214 ++++++++++++++++++----------------------------------
1 files changed, 75 insertions(+), 139 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-land.json b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-land.json
index 3cfa032..073497c 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-land.json
+++ b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-land.json
@@ -1,23 +1,23 @@
[
{
- "outputFile": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-land\\values-land.xml",
+ "outputFile": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-land\\values-land.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
- "endColumn": 69,
- "endOffset": 120
+ "endColumn": 61,
+ "endOffset": 112
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-land\\values-land.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-land\\values-land.xml",
"position": {
- "startLine": 2,
+ "startLine": 4,
"startColumn": 4,
- "startOffset": 55,
- "endColumn": 69,
- "endOffset": 120
+ "startOffset": 287,
+ "endColumn": 61,
+ "endOffset": 344
}
}
},
@@ -25,18 +25,18 @@
"to": {
"startLine": 3,
"startColumn": 4,
- "startOffset": 125,
- "endColumn": 63,
+ "startOffset": 117,
+ "endColumn": 71,
"endOffset": 184
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-land\\values-land.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-land\\values-land.xml",
"position": {
- "startLine": 3,
+ "startLine": 7,
"startColumn": 4,
- "startOffset": 125,
- "endColumn": 63,
- "endOffset": 184
+ "startOffset": 582,
+ "endColumn": 71,
+ "endOffset": 649
}
}
},
@@ -45,119 +45,17 @@
"startLine": 4,
"startColumn": 4,
"startOffset": 189,
- "endColumn": 70,
- "endOffset": 255
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-land\\values-land.xml",
- "position": {
- "startLine": 4,
- "startColumn": 4,
- "startOffset": 189,
- "endColumn": 70,
- "endOffset": 255
- }
- }
- },
- {
- "to": {
- "startLine": 5,
- "startColumn": 4,
- "startOffset": 260,
- "endColumn": 67,
- "endOffset": 323
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-land\\values-land.xml",
- "position": {
- "startLine": 5,
- "startColumn": 4,
- "startOffset": 260,
- "endColumn": 67,
- "endOffset": 323
- }
- }
- },
- {
- "to": {
- "startLine": 6,
- "startColumn": 4,
- "startOffset": 328,
- "endLine": 9,
- "endColumn": 12,
- "endOffset": 505
- },
- "from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\values-land\\values-land.xml",
- "position": {
- "startLine": 2,
- "startColumn": 4,
- "startOffset": 55,
- "endLine": 5,
- "endColumn": 12,
- "endOffset": 232
- }
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-land\\values-land.xml",
- "map": [
- {
- "to": {
- "startLine": 2,
- "startColumn": 4,
- "startOffset": 55,
"endColumn": 69,
- "endOffset": 120
+ "endOffset": 254
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-land\\values-land.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-land\\values-land.xml",
"position": {
- "startLine": 2,
+ "startLine": 10,
"startColumn": 4,
- "startOffset": 55,
+ "startOffset": 896,
"endColumn": 69,
- "endOffset": 120
- }
- }
- },
- {
- "to": {
- "startLine": 3,
- "startColumn": 4,
- "startOffset": 125,
- "endColumn": 63,
- "endOffset": 184
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-land\\values-land.xml",
- "position": {
- "startLine": 3,
- "startColumn": 4,
- "startOffset": 125,
- "endColumn": 63,
- "endOffset": 184
- }
- }
- },
- {
- "to": {
- "startLine": 4,
- "startColumn": 4,
- "startOffset": 189,
- "endColumn": 70,
- "endOffset": 255
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-land\\values-land.xml",
- "position": {
- "startLine": 4,
- "startColumn": 4,
- "startOffset": 189,
- "endColumn": 70,
- "endOffset": 255
+ "endOffset": 961
}
}
},
@@ -165,18 +63,18 @@
"to": {
"startLine": 5,
"startColumn": 4,
- "startOffset": 260,
- "endColumn": 67,
- "endOffset": 323
+ "startOffset": 259,
+ "endColumn": 63,
+ "endOffset": 318
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-land\\values-land.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-land\\values-land.xml",
"position": {
- "startLine": 5,
+ "startLine": 13,
"startColumn": 4,
- "startOffset": 260,
- "endColumn": 67,
- "endOffset": 323
+ "startOffset": 1199,
+ "endColumn": 63,
+ "endOffset": 1258
}
}
},
@@ -184,20 +82,58 @@
"to": {
"startLine": 6,
"startColumn": 4,
- "startOffset": 328,
- "endLine": 9,
- "endColumn": 12,
- "endOffset": 505
+ "startOffset": 323,
+ "endColumn": 70,
+ "endOffset": 389
},
"from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\25.1.0\\res\\values-land\\values-land.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-land\\values-land.xml",
"position": {
- "startLine": 2,
+ "startLine": 16,
"startColumn": 4,
- "startOffset": 55,
- "endLine": 5,
+ "startOffset": 1505,
+ "endColumn": 70,
+ "endOffset": 1571
+ }
+ }
+ },
+ {
+ "to": {
+ "startLine": 7,
+ "startColumn": 4,
+ "startOffset": 394,
+ "endColumn": 67,
+ "endOffset": 457
+ },
+ "from": {
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-land\\values-land.xml",
+ "position": {
+ "startLine": 17,
+ "startColumn": 4,
+ "startOffset": 1576,
+ "endColumn": 67,
+ "endOffset": 1639
+ }
+ }
+ },
+ {
+ "to": {
+ "startLine": 8,
+ "startColumn": 4,
+ "startOffset": 462,
+ "endLine": 11,
+ "endColumn": 12,
+ "endOffset": 639
+ },
+ "from": {
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\design\\23.1.0\\res\\values-land\\values-land.xml",
+ "position": {
+ "startLine": 4,
+ "startColumn": 4,
+ "startOffset": 282,
+ "endLine": 7,
"endColumn": 12,
- "endOffset": 232
+ "endOffset": 459
}
}
}
--
Gitblit v1.8.0